Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 26529)
+++ applications/editors/josm/i18n/po/ar.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2010-12-30 18:13+0000\n"
 "Last-Translator: Hsn <hh.alshawaf@gmail.com>\n"
@@ -18,10 +18,10 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:33+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:34+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -36,12 +36,12 @@
 msgstr "المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "تجاهل URL ملف غيرصحيح التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -96,6 +96,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -119,14 +120,14 @@
 msgstr "التحذير"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "تجاهل URL سيئة التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -136,13 +137,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -162,7 +163,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -172,6 +173,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -202,5 +203,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -380,6 +381,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -406,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -412,7 +413,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -420,5 +422,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -627,5 +629,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -871,5 +873,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -878,5 +880,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1057,6 +1059,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1207,5 +1209,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1421,6 +1423,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr ""
@@ -2057,5 +2059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2359,7 +2361,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr ""
@@ -2610,5 +2612,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2734,10 +2736,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2896,5 +2898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3448,5 +3450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3497,40 +3499,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
+msgid "Set {0}={1} for node ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
-#, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3650,4 +3652,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3944,6 +3947,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -3980,5 +3983,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4082,5 +4085,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4190,5 +4193,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4211,8 +4214,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4352,50 +4355,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "حزام لامبيرت (أستونيا)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "مركاتوري"
@@ -4420,80 +4437,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4712,45 +4749,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5017,5 +5054,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5040,5 +5077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5049,5 +5086,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5453,5 +5490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5517,5 +5554,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "من النوع طريق"
@@ -5523,5 +5560,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5529,10 +5566,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "مجرى مياه"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "إستعمال الأرض"
@@ -5542,5 +5579,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5558,5 +5595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5569,5 +5606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5919,5 +5956,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6026,4 +6063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6122,5 +6160,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6163,5 +6201,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6448,6 +6486,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6675,9 +6713,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr ""
 
@@ -6734,6 +6772,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6755,6 +6793,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7145,5 +7183,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7380,5 +7418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7592,7 +7630,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "مجهول"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7856,5 +7924,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7874,5 +7942,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7889,5 +7957,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7895,5 +7963,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -7936,5 +8004,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7942,5 +8010,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8132,5 +8200,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8230,5 +8298,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "المستخدِم"
@@ -9222,5 +9289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9402,5 +9469,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9543,4 +9610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9552,4 +9620,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9812,9 +9886,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9823,13 +9897,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9842,18 +9916,19 @@
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "غيّر القيم ؟"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9862,5 +9937,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9870,5 +9945,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9877,27 +9952,31 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9906,62 +9985,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10025,8 +10104,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10049,5 +10130,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10377,9 +10458,4 @@
 msgstr "حصل {0} تضارب خلال الإسيراد"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10419,10 +10495,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10696,37 +10766,4 @@
 msgstr "النوع"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "مجهول"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10842,20 +10879,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -10947,5 +10984,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11481,8 +11518,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11884,4 +11921,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11907,11 +11945,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -11988,38 +12019,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "خصّص اللون"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "الغيابي"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "الإسم: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "الوصف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12030,9 +12061,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12040,26 +12071,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12068,8 +12099,8 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12078,12 +12109,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12092,10 +12123,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12103,78 +12134,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12183,11 +12214,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12195,6 +12226,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12202,27 +12233,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12232,29 +12263,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12358,5 +12389,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12366,57 +12397,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -12939,10 +12978,10 @@
 msgstr "صور  (*.jpg)JPEG"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -12954,5 +12993,5 @@
 msgstr[5] "دالات"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -12961,26 +13000,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "مزامنة الصوت"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -12988,14 +13027,14 @@
 msgstr "تمّت مزامنة الصوت على النقطة {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13019,13 +13058,13 @@
 msgstr "غير قادر على إنشاء دالة صوتيت جديدة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr ""
@@ -13959,82 +13998,82 @@
 msgstr "الألوان"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "أرسم أسهم الإتجاه"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14042,15 +14081,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "المعطيات أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14061,47 +14136,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14109,5 +14176,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14131,5 +14198,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14172,5 +14239,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14184,38 +14251,18 @@
 msgstr "المشي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14224,10 +14271,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14235,30 +14282,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14266,5 +14313,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14272,14 +14319,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14287,13 +14334,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14301,27 +14348,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -14982,5 +15047,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15072,5 +15137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr ""
@@ -15347,5 +15412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15735,5 +15800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15762,9 +15827,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16042,6 +16107,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16364,5 +16429,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16574,5 +16639,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -16960,4 +17025,9 @@
 msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17749,4 +17819,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -17863,4 +17935,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18424,5 +18510,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34723,4 +34809,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34737,6 +34824,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34755,15 +34842,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "إسم شارع مختصر"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr ""
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr ""
@@ -34774,12 +34861,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr ""
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr ""
@@ -34788,16 +34875,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "طريق عام بدون مرجع"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "نوع طريق عام مؤقت"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "خطء إملائي في إسم المفتاح"
@@ -34807,10 +34894,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr ""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -34819,10 +34906,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "حاجز مستعمل على طريق"
@@ -34831,34 +34918,43 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "السرعة الأقصى المستعملة لطريق قدم"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr ""
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "إسم شارع يحتوي على ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "علاقة بدون نوع"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "مطعم بدون إسم"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
 msgstr ""
 
@@ -34964,117 +35060,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "خرائط NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr ""
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35319,6 +35425,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "تمّ إلغاء التحميل"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35420,9 +35526,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35440,23 +35546,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35464,26 +35600,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "المعلومات"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35491,5 +35655,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35600,9 +35764,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35701,17 +35865,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36342,28 +36523,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36481,6 +36669,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37362,5 +37550,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37370,17 +37558,17 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
@@ -37532,5 +37720,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37538,10 +37726,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37550,5 +37738,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37557,6 +37745,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37565,9 +37753,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37726,71 +37914,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37798,32 +37994,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -37858,6 +38048,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -37988,30 +38178,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38697,5 +38900,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38712,5 +38915,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39438,17 +39641,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39462,36 +39665,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40113,5 +40312,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41079,4 +41278,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41296,6 +41512,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41542,5 +41758,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42111,5 +42327,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42495,850 +42711,7 @@
 msgstr ""
 
-#~ msgid "Unknown version"
-#~ msgstr "نسخة مجهولة"
-
-#~ msgid "Preparing data..."
-#~ msgstr "جاري تحضير المعطيات..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "الإسم أو كلمة المرور خطأ"
-
-#~ msgid "Aborting..."
-#~ msgstr "إجهاض..."
-
-#~ msgid "Enter Password"
-#~ msgstr "أدخل كلمة المرور"
-
-#~ msgid "Do not show again"
-#~ msgstr "لا تظهر مرة اخرى"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "لا تطبق التغييرات"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "دور غير معروف ''{0}''."
-
-#~ msgid "Error: {0}"
-#~ msgstr "خطأ : {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "تحذير: {0}"
-
-#~ msgid "false"
-#~ msgstr "خاطئ"
-
-#~ msgid "true"
-#~ msgstr "حقيقي"
-
-#~ msgid "different"
-#~ msgstr "مختلف"
-
-#~ msgid "S"
-#~ msgstr "ج."
-
-#~ msgid "N"
-#~ msgstr "ش."
-
-#~ msgid "W"
-#~ msgstr "غ."
-
-#~ msgid "Rotate"
-#~ msgstr "أدر"
-
-#~ msgid "E"
-#~ msgstr "ش."
-
-#~ msgid "Change"
-#~ msgstr "غيّر"
-
-#~ msgid "Move"
-#~ msgstr "حرك"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "هذه العقد ليست في مستديرة."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "حمّل هذه التغييرات :"
-
-#~ msgid "Uploading data"
-#~ msgstr "جاري تحميل التغييرات"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "إمتداد ملف غير معروف."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "حصل خطأ عند الحفظ."
-
-#~ msgid "Email"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "Previous Marker"
-#~ msgstr "العلامة السابقة"
-
-#~ msgid "Play previous marker."
-#~ msgstr "شغل العلامة السابقة"
-
-#~ msgid "Jump forward"
-#~ msgstr "أقفظ إلى الأمام"
-
-#~ msgid "Jump back."
-#~ msgstr "أقفظ رجوعاُ"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "إتصل بــ {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "جاري التنزيل..."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "الرجاء إدخال مصطلحات البحث."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "مسموح فقط عقدتين"
-
-#~ msgid "No data imported."
-#~ msgstr "لم يتم تحميل أي معطيات"
-
-#~ msgid "Data Layer"
-#~ msgstr "طبقة المعطيات"
-
-#~ msgid "Open in Browser"
-#~ msgstr "إفتح في المتصفح"
-
-#~ msgid "File not found"
-#~ msgstr "لم يُعثر على الملف"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "مصادر المعطيات و نوعيتها"
-
-#~ msgid "to"
-#~ msgstr "إلى"
-
-#~ msgid "Download Area"
-#~ msgstr "نزّل المساحة"
-
-#~ msgid "zoom level"
-#~ msgstr "نسبة التكبير/التصغير"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "الرجاء إدخال مصطلحات البحث"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "الرجاء إدخال إسم للموقع."
-
-#~ msgid "zoom"
-#~ msgstr "تكبير/تصغير"
-
-#~ msgid "near"
-#~ msgstr "قرب"
-
-#~ msgid "name"
-#~ msgstr "الإسم"
-
-#~ msgid "Timespan: "
-#~ msgstr "الفترة الزمنية "
-
-#~ msgid "Length: "
-#~ msgstr "الطول: "
-
-#~ msgid "optician"
-#~ msgstr "نظاراتي"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "حرّر مشروبات"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "عدد الأسلاك"
-
-#~ msgid "Edit Football"
-#~ msgstr "حرّر كرة القدم"
-
-#~ msgid "Football"
-#~ msgstr "كرة القدم"
-
-#~ msgid "intermedia"
-#~ msgstr "متوسط"
-
-#~ msgid "advance"
-#~ msgstr "متقدم"
-
-#~ msgid "Motor Sports"
-#~ msgstr "رياضة المحركات"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "حرّر رياضة المحركات"
-
-#~ msgid "citymap"
-#~ msgstr "خريطة المدينة"
-
-#~ msgid "map"
-#~ msgstr "خريطة"
-
-#~ msgid "Accomodation"
-#~ msgstr "مكان المبيت"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "تأكد  من ضمّ المعلومات التالية:"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "غرض غير مسموح به معروف بــ id=0"
-
-#~ msgid "Preparing..."
-#~ msgstr "اعداد..."
-
-#~ msgid "Login"
-#~ msgstr "دخول"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً."
-
-#~ msgid "y from"
-#~ msgstr "ي من"
-
-#~ msgid "x from"
-#~ msgstr "س من"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "إختر أولاً إشارة مرجعية"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "دلّ على الخطوات اللتي أوصلتك إلى هذا الخطأ ( بطريقة مفصلة)"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "لا يوجد لــ <nd>  أي مرجع"
-
-#~ msgid "Commit comment"
-#~ msgstr "أودع الملاحظات"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} باقية. متابعة الإرسال لِــ {4}: {5} (id: {6})"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "ضذوذ تكوين معرف العقدة"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "لم أتمكن من قراءة الإسقاط من التفضيلات. إستعمال EPSG:4326"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):"
-
-#~ msgid "Uploading..."
-#~ msgstr "جاري الإرسال..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "حرّر الخصائص"
-
-#~ msgid "Edit new relation"
-#~ msgstr "حرّر العلاقة الجديدة"
-
-#~ msgid "Create new relation"
-#~ msgstr "أنشا علاقة جديدة"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "حرّر العلاقة رقم {0}"
-
-#~ msgid "Add Selected"
-#~ msgstr "أضف الإختيار"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "غير قادر على الإتصال بلمخدم."
-
-#~ msgid "Members: {0}"
-#~ msgstr "الأعضاء: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "المؤلفون: {0}"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "لمّا مفعّل."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "الطبقات: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "إنعاش لائحة الخيارات."
-
-#~ msgid "Error during parse."
-#~ msgstr "خطأ تحليل نحوي"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "قيمة فارغة ستمحي المفتاح."
-
-#~ msgid "Occupied By"
-#~ msgstr "المشغول من"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة"
-
-#~ msgid "Remove Selected"
-#~ msgstr "أزل المختارة"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "هناك تغييرات غير محفوظة.رغم ذالك أمحي الطبقة ؟"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "هل تريد فعلاً محو كلّ الطبقة ؟"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "أعرض/أخفي النص/الأيقونات"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "أمحي الطبقة المختارة."
-
-#~ msgid "Delete Layer"
-#~ msgstr "أمحي الطبقة"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "دمج التناقضات."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "التناقضات: {0}"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "حلّ التناقضات"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "نقطة"
-#~ msgstr[1] "نقطتين"
-#~ msgstr[2] "نقاط"
-#~ msgstr[3] "نقاط"
-#~ msgstr[4] "نقاط"
-#~ msgstr[5] "نقاط"
-
-#~ msgid "Images for {0}"
-#~ msgstr "الصول لِــ {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "إقرءGPX..."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "لا توقيت للنقطة {0} x {1}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "إختلاف في التوقيت الجغرافي: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} من ضمن المسلك."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "لم أتمكن من كتابة العلامة المرجعية."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "لم أتمكن من قراءة العلامات المرجعية."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} ممحي.)"
-
-#~ msgid "Download List"
-#~ msgstr "لائحة التنزيل."
-
-#~ msgid "Proxy server host"
-#~ msgstr "مضيف مخدم التوكيل"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "إعدادات الوكيل"
-
-#~ msgid "Anonymous"
-#~ msgstr "بدون ذكر الإسم"
-
-#~ msgid "Proxy server port"
-#~ msgstr "منفذ مخدم التوكيل"
-
-#~ msgid "Proxy server username"
-#~ msgstr "الإسم على مخدم التوكيل"
-
-#~ msgid "Proxy server password"
-#~ msgstr "كلمة المرور عند مخدم التوكيل"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>شكراً لتفهمك</p>"
-
-#~ msgid "layer not in list."
-#~ msgstr "الطبقة ليست في اللائحة."
-
-#~ msgid "Set the language."
-#~ msgstr "عيّن اللغة"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: الإصدار {1}{2}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "أمحي {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "أمحي {1} {0}"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "درجات دقائق ثواني"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "أمحي العضو ''{0}'' في العلاقة."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "عضو فارغ في العلاقة."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
-
-#~ msgid "bicyclemap"
-#~ msgstr "خريطة راكب دراجة"
-
-#~ msgid "Station"
-#~ msgstr "محطة"
-
-#~ msgid "Edit Station"
-#~ msgstr "حرّر محطة"
-
-#~ msgid "Footway"
-#~ msgstr "طريق قدم"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "المجموعة المسبقة التعريف ''{0}''"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "حصل تعارض حين الإستيراد."
-
-#~ msgid "Move Down"
-#~ msgstr "حرّك إلى الأسفل"
-
-#~ msgid "Move Up"
-#~ msgstr "حرّك إلى الأعلى"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "محرّر العلاقات: {0}"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} نقطة"
-#~ msgstr[1] "نقطتين {0}"
-#~ msgstr[2] "{0} نقاط"
-#~ msgstr[3] "{0} نقطة"
-#~ msgstr[4] "{0} نقطة"
-#~ msgstr[5] "{0} نقطة"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "الإنحراف الحالي: {0}ث"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "صورة"
-#~ msgstr[1] "صورتين"
-#~ msgstr[2] "صور"
-#~ msgstr[3] "صورة"
-#~ msgstr[4] "صور"
-#~ msgstr[5] "صور"
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL الخادم الأساسي"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "أحذف \"{0}\"  لِــ {1} {2}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "الخيار \"{0}\" مستعمل من العلاقة \"{1}\" في الدور {2}.\n"
-#~ "محو من العلاقة ؟"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "عيّن  {0}={1} لِــ {2} {3}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "حلّ {0} التناقضات في {1} أغراض"
-
-#~ msgid "position"
-#~ msgstr "المكان"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "علاقة متناقضة"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "غير قادر على فتح دليل التفضيلات: {0}"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "حزام لامبيرت (فرنسا)"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "لم أجد طريق \"إلى\""
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "للطريق ''{0}'' أقل من نقطتين."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "لم أجد طريق \"من\""
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "نوع عضو غير معروف لِــ ''{0}''"
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
-
-#~ msgid "History of Element"
-#~ msgstr "الخط الزمني للعنصر"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "لم أتمكن من إعادة تسمية الملف \"{0}\"."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "ادخل القيم لكل التناقضات."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "كل الطرقات كانت فارغة"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "على أي حال ادمج"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "حلل التناقضات"
-
-#~ msgid "Create a new map."
-#~ msgstr "أنشئ خريطة جديدة."
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "جُمل غير معروفة: "
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "جمل غير صحيحة التكوين: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "إحداثيات 0 "
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً."
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "فشل إستيراد NMEA !"
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"شارع الفران\"</b> - 'شارع الفران' في أي مفتاح أو إسم."
-
-#~ msgid "Load Selection"
-#~ msgstr "حمّل الخيار"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "لم أتمكن من القراءة من الــ URL: \"{0}\""
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - الأغراض المعرفة بلــ ID المحدد"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>العقد:</b>... - الغرض ذات عدد العقد المحدد"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "إختر، حرّك و دوّر أغراض"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "ادمجعلى كلّ حال"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "يجب أن يتكون الخيار من طرقات فقط."
-
-#~ msgid "Only one node selected"
-#~ msgstr "عقدة واحدة محددة فقط"
-
-#~ msgid "Update Data"
-#~ msgstr "تحديث المعطيات"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "إستعمل الدرجات العشرية."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "أدخل الأحداثيات للعقدة الجديدة."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية"
-
-#~ msgid "Play next marker."
-#~ msgstr "شغّل العلامة التالية."
-
-#~ msgid "Next Marker"
-#~ msgstr "العلامة التالية"
-
-#~ msgid "Faster Forward"
-#~ msgstr "تقدّم سريع"
-
-#~ msgid "change the selection"
-#~ msgstr "غيّر الخيار"
-
-#~ msgid "Permitted actions"
-#~ msgstr "الأفعال المسموح بها"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "بعض العقد موجودة (تقريباً) في الخطّ"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "الرجاء إختيار ثلاثة عقد بلضبط أو إختر طريقاً واحدة تضم ثلاثة عقد بلضبط."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "خطء عند تحميل الصفحة {0}"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "حصلت الأخطاء التالية عند التنزيل الضخم:"
-
-#~ msgid "Slower Forward"
-#~ msgstr "تقدّم بطيء"
-
-#~ msgid "Errors during Download"
-#~ msgstr "أخطاء عند التنزيل"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "أقلب عرض ملء الشاشة"
-
-#~ msgid "Full Screen"
-#~ msgstr "ملء الشاشة"
-
-#~ msgid "sports"
-#~ msgstr "مبيع لوازم للأنشطة رياضية"
-
-#~ msgid "Open User Page"
-#~ msgstr "إفتح صفحة المستخدم"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "إفتح صفحة المستخدم في متصفح الإنترنت"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "أعرض لوحة المؤلف"
-
-#~ msgid "Help / About"
-#~ msgstr "المساعدة / حول"
-
-#~ msgid "help"
-#~ msgstr "مساعدة"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "تكدس الأوامر: {0}"
-
-#~ msgid "gps track description"
-#~ msgstr "وصف أثر جهاز تحديد المواقع العالمي"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\">الإنكليزية</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A "
-#~ "HREF=\"{1}\">بِلغتك</A>."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "تمكين خادم التوكيل"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "تمكين الغيابيات المبيتة"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "إفتح طبقة  أولاً ( جي بي إكس، أو أس أم ، خابية)"
-
-#~ msgid "Amenities"
-#~ msgstr "خدمات/نافعات"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "حرّر مكتب إستعلامات"
-
-#~ msgid "Map Type"
-#~ msgstr "نوع الخريطة"
-
-#~ msgid "Board Type"
-#~ msgstr "نوع اللوحة"
-
-#~ msgid "board"
-#~ msgstr "اللوح"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "حمّل إلى أو.أس.أم ..."
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "المساعدة على الخط لِـ ج.أو.أس.أم"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "جاري الإتصال بلخادم أو.أس.أم ..."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
-
-#~ msgid "OSM password"
-#~ msgstr "كلمة المرور أو.أس.أم"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم."
-
-#~ msgid "No username provided."
-#~ msgstr "لم يتم إعطاء إسم للمؤلف"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "الرجاء إنتقاء مستخدم بواسطة لوحة المؤلف"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "عفواً، لا يعمل للمستخدمين مجهولي الهوية"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "يبدل الخيار بمعطيات المستخدمين"
-
-#~ msgid "Select User's Data"
-#~ msgstr "إختر معطيات المستخدم"
-
-#~ msgid "Charge"
-#~ msgstr "رسم الدخول / الإستعمال"
-
-#~ msgid "Waterway Point"
-#~ msgstr "نقطة مجرى ماء"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "الإرتفاع الأقصى (أمتار)"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟"
-
-#~ msgid "Save and Exit"
-#~ msgstr "حفظ و خروج"
-
-#~ msgid "File could not be found."
-#~ msgstr "لا يمكن العثور عن الملف"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "التغييرات غير المحفوظة"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr "الإسقاط لا يمكن أن يقرأ من الأفضليات. باستخدام Mercartor"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr "الإسقاط لا يمكن أن يقرأ من الأفضليات. باستخدام Mercator"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\">الإنكليزية</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "صفحة المساعدة مفقودة. إنشائها بِــ <A HREF=\"{0}\"> الإنكليزية</A> أو <A "
-#~ "HREF=\"{1}\">بِلغتك</A>."
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "لم أتمكن من قراءة \"{0}\""
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "الرجاء إدخال خط طول  من ضمن المجال  -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "الرجاء إدخال خط عرض صالح  من ضمن المجال -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "الرجاء إدخال خط طول صالح  من ضمن المجال  -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "الرجاء إدخال خط عرض  من ضمن المجال -180..180"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>لم أتمكن من قراءة الوثيقة ''{0}''.<br> الخطء هو : <br>{1}</html>"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "أغلق الحوار، لا تأنشئ عقدة جديدة"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "تضاربات حين التنزيل"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "عرض ملء الشاشة"
-
-#~ msgid "Fix relations"
-#~ msgstr "صلّح العلاقات"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr "إستحالة الإتصال بالخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
+#~ msgid "Change values?"
+#~ msgstr "غيّر القيم ؟"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "تمّ إلغاء التحميل"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 26529)
+++ applications/editors/josm/i18n/po/bg.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:34+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:35+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Помощ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнориране неправилен адрес на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,15 +119,15 @@
 msgstr "Внимание"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Параметърът \"downloadgps\" не възприема имена на файлове или файлови URL."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнориране на неправилна препратка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "(съвместима с Java 5) версия на  JOSM.</li></ul>За повече информация:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Изход от програмата"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Продължи все пак"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -385,6 +386,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -411,5 +412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -417,7 +418,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -425,5 +427,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -634,5 +636,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -882,5 +884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -889,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1069,6 +1071,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1220,5 +1222,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1440,6 +1442,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2086,5 +2088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2403,7 +2405,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr ""
@@ -2654,7 +2656,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2779,10 +2780,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2948,5 +2949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3517,5 +3518,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3566,40 +3567,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Премахване на \"{0}\" за възел ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Премахване на \"{0}\" за път ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Премахване на \"{0}\" за отношение ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Направи {0}={1} за възел ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Направи {0}={1} за път ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Направи {0}={1} за отношение ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3725,4 +3726,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Потвърждение за изтриване"
@@ -4029,6 +4031,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4065,5 +4067,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4167,5 +4169,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4267,5 +4269,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4284,8 +4286,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4425,50 +4427,64 @@
 msgstr "WGS84 Geographic"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Ламбертова Зона (Естония)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Проекция Меркатор"
@@ -4493,80 +4509,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарска Мрежа (Швейцария)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Север"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4788,45 +4824,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5103,5 +5139,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5126,5 +5162,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5135,5 +5171,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5545,5 +5581,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5611,5 +5647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "път"
@@ -5617,5 +5653,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5623,10 +5659,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "водоеми"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "земеползване"
@@ -5636,5 +5672,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5648,5 +5684,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5659,5 +5695,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6015,5 +6051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6122,4 +6158,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6219,5 +6256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6260,5 +6297,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6545,9 +6582,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Списък на обединените елементи. Те ще заместят моите елементи, когато се "
-"приложат решенията за обединяване."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6775,10 +6810,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Запазване на моите координати"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Запазване на техните координати"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6834,6 +6869,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6855,6 +6890,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7241,5 +7276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7476,5 +7511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7688,7 +7723,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "неизвестно"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7952,5 +8017,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7970,5 +8035,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7985,5 +8050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7991,5 +8056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -8032,5 +8097,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8038,5 +8103,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8232,5 +8297,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8330,5 +8395,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Потребител"
@@ -9322,5 +9386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9502,5 +9566,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9643,4 +9707,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9652,4 +9717,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9912,9 +9983,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9923,13 +9994,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9942,18 +10013,19 @@
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Промени стойностите?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Замяна"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9962,5 +10034,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9970,5 +10042,5 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9977,27 +10049,31 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Изберете стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Моля, изберете обектите, чиито параметри искате да промените."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Параметри/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Параметри на избраните обекти"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10006,62 +10082,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Промяна на релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Изтриване от релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10125,8 +10201,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10149,5 +10227,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10477,9 +10555,4 @@
 msgstr "{0} конфликт(а) при въвеждането"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10520,10 +10593,4 @@
 msgid "Load relation"
 msgstr "Зареждане на релация"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10800,37 +10867,4 @@
 msgstr "Тип"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "неизвестно"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10946,20 +10980,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Историята на възел {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "историята на път {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Историята на отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -11051,5 +11085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11601,8 +11635,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12015,4 +12049,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12038,11 +12073,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12119,38 +12147,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Избор цвят"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "По подразбиране"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Изберете цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12161,9 +12189,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12171,26 +12199,26 @@
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12199,8 +12227,8 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12209,12 +12237,12 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "GPS точка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12223,10 +12251,10 @@
 msgstr[1] "{0} следи, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12234,78 +12262,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12316,11 +12344,11 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12330,6 +12358,6 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12339,27 +12367,27 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Маркери от наименувани точки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Наименувани точки от следа от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Импорт Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12369,29 +12397,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave аудио файлове (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудио маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Импорт на изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12495,5 +12523,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12503,57 +12531,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Зареждане на квадрант"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Зареждане на всички квадранти"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Увеличаване на мащаба"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Намаляне на мащаба"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Изчистване на кеша"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13091,10 +13127,10 @@
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "GPS маркер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13102,5 +13138,5 @@
 msgstr[1] "маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13109,22 +13145,22 @@
 msgstr[1] "{0} се състои от {1} маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 "Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Превключване видимостта на маркер текста и икони."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Синхронизиране аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13133,5 +13169,5 @@
 "синхронизиращ сигнал."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13139,14 +13175,14 @@
 msgstr "Аудио синхронизирано на точка {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Установи аудио маркер на позицията на прослушване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13176,13 +13212,13 @@
 msgstr "Невъзможно да се създаде нов аудио-маркер."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Възникна грешка при опит да се покаже URL препратката за този маркер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL беше: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Грешка показване URL"
@@ -14131,73 +14167,73 @@
 msgstr "Цветове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Изобразвай направлението със стрелки"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Само в началото на път."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Показвай поредния номер на сегментите"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Изобразвай границите на свалените данни."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Изобразявай виртуални възли в режим на избор."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Изобразявай неактивните слоеве в друг цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Изглаждане на линиите (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Показване на направлението на сегментите на пътя."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показване поредните номера на всички сегменти на пътя."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Приложи изглаждане върху картата."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Изобразяване границата на свалената от сървъра област."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14206,9 +14242,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Изобразяване неактивните слоеве с данни в други цветове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14216,15 +14252,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM Данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Никога"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Използвай глобалните настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14235,48 +14307,40 @@
 msgstr "Всички"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Само локални файлове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Никога"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Изобразвай линии, даже и ако не са импортирани сегменти."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Изобразявай големи GPS точките."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорост (червено = бавно, зелено = бързо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -14284,5 +14348,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14306,5 +14370,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14347,5 +14411,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14359,38 +14423,18 @@
 msgstr "Пеш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Бързо изрисуване (изглежда по-зле)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14401,10 +14445,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Свързване с линии на GPS точките"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14414,10 +14458,10 @@
 "Задайте ''-1'' за чертаене на всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Максимална дължина за локални файлове (метри)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14426,20 +14470,20 @@
 "се рисуват всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Максимална дължина (в метри)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14448,5 +14492,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14455,14 +14499,14 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Минимално разстояние (в пиксели)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Рисуване на по-големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14472,13 +14516,13 @@
 "в мениджър слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Оцветяване точките от следите според скоростта."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14486,10 +14530,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -14497,18 +14541,36 @@
 "скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Оцветяване на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15172,5 +15234,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15262,5 +15324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Нулиране"
@@ -15539,5 +15601,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15923,5 +15985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15950,9 +16012,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Търсене в етикетите"
@@ -16232,6 +16294,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16554,5 +16616,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16766,5 +16828,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17155,4 +17217,9 @@
 msgstr "Съхрани потребителското име и паролата (нешифрирано)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17960,4 +18027,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18079,4 +18148,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18651,5 +18734,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34970,4 +35053,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34984,6 +35068,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35002,15 +35086,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "съкретено име на улицата"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "маркер \"еднопосочна\" на точка"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "маркер \"мост\" на точка"
@@ -35021,12 +35105,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "неправилен маркер \"highway\" на точка"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Ненаименуван и некласифициран път"
@@ -35035,16 +35119,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "път без означение (highway без reference)"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "временен тип път"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "правописна грешка в името на ключа"
@@ -35054,10 +35138,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "велоалея с маркер \"велосипед\""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "пешеходен път с маркер \"пеш\""
@@ -35066,10 +35150,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "отделно платно за велосипедисти на велоалея"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "преграда по пътя на движение"
@@ -35078,35 +35162,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "макс. скорост за пешеходния път"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "маркер за слой със знак +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "името на улицата съдържа ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "релацията няма тип"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "ресторант без име"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "необичайна комбимация маркери"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35211,117 +35304,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Карти"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Карти (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Сицилия - Италия"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35568,6 +35671,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Качването е отменено"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35669,9 +35772,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35689,23 +35792,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35713,26 +35846,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Информация за добавка"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35740,5 +35901,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35849,9 +36010,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35950,17 +36111,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36591,28 +36769,35 @@
 msgstr "Избор на комуна"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Кадастър"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Авто-определяне източници"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36738,8 +36923,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37637,5 +37821,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37645,17 +37829,17 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Чертай линии между точките на този слой."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Не чертай линии между точките на този слой."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Избиране варианти за чертане на линиите."
@@ -37807,5 +37991,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37813,10 +37997,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37825,5 +38009,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37832,6 +38016,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37840,9 +38024,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38001,71 +38185,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38073,32 +38265,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38133,6 +38319,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38263,30 +38449,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38987,5 +39186,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39002,5 +39201,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39738,17 +39937,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39762,36 +39961,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40413,5 +40608,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41384,4 +41579,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41601,6 +41813,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41847,5 +42059,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42416,5 +42628,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42800,3239 +43012,34 @@
 msgstr ""
 
+#~ msgid "Change values?"
+#~ msgstr "Промени стойностите?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "необичайна комбимация маркери"
+
 #~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Възникнаха проблеми със следните разширения:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Разширението успешно обновено. Моля рестартирайте JOSM."
-#~ msgstr[1] "{0} Разширенията успешно обновени. Моля рестартирайте JOSM."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Обновяване разширения"
+#~ "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Качването е отменено"
 
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Разширение {0} изглежда повредено или не може да бъде свалено автоматично."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Грешка при разбор: невалидна структура на gpx документа"
+#~ "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Сървърът върна във вътрешна грешка. Опитайте да намалите областта или "
-#~ "повторете опита си по-късно."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Невъзможно да се свали разширение: {0} от {1} достъпни"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към "
-#~ "интернет."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Отваряне на списък промени по версии..."
-
-#~ msgid "Commit comment"
-#~ msgstr "Коментар на съхранението"
-
-#~ msgid "Preparing..."
-#~ msgstr "Подготвяне…"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Сървъра не поддържа управление на версиите"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Качване..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестна версия"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Намерен е елемент <nd> извън път."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Липсва необходимия атрибут \"{0}\"."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "към <nd> няма обръщения ref."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Недопустим обект с id=0"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Подготвяне на данните..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Грешка при разбор."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Грешка! Възможно е да липсват маркери (тагове)."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Открит е маркер <member> извън релация."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Грешна парола или потребителско име."
-
-#~ msgid "Enter Password"
-#~ msgstr "Въведете парола"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Неправилен код на точка"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Внимание - заявено е зареждане на модул {0}. Този модул не се изисква "
-#~ "вече."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Може да промените броя дни преди да се появи това предупреждение "
-#~ "отново<br>чрез задаването на конфигурационната опция 'pluginmanager."
-#~ "warntime'.)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Прекъсване..."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Проекцията не може да бъде прочетена от настройките. Ще използваме "
-#~ "EPSG:4326"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Има несъхранени промени. Да ги отхвърлим ли за да продължим?"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Незаписани промени"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра."
-
-#~ msgid "Do not show again"
-#~ msgstr "Да не се показва повече"
-
-#~ msgid "position"
-#~ msgstr "позиция"
-
-#~ msgid "different"
-#~ msgstr "различно"
-
-#~ msgid "false"
-#~ msgstr "лъжа"
-
-#~ msgid "true"
-#~ msgstr "истина"
-
-#~ msgid "S"
-#~ msgstr "Ю"
-
-#~ msgid "N"
-#~ msgstr "С"
-
-#~ msgid "W"
-#~ msgstr "З"
-
-#~ msgid "E"
-#~ msgstr "И"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Rotate"
-#~ msgstr "Завъртане"
-
-#~ msgid "Change"
-#~ msgstr "Промени"
-
-#~ msgid "Move"
-#~ msgstr "Преместване"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Моля, съобщете за грешката на адрес {0}"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Възникна неочаквана грешка.\n"
-#~ "\n"
-#~ "Това винаги е грешка в кода на програмата. Ако използвате последна "
-#~ "версия \n"
-#~ "на JOSM, бъдете така добри да съобщите за проблема."
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Опитайте да обновите до най-нова версия на JOSM и на всички разширения "
-#~ "преди да съобщите за грешка."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Прикрепете следната информация към репорта ви:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Укажете последователността от действия, която предизвика грешката "
-#~ "(колкото се може по-подробно!)"
-
-#~ msgid "x from"
-#~ msgstr "x от"
-
-#~ msgid "zoom level"
-#~ msgstr "мащаб"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Моля въведете име на мястото."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Моля, въведете първо желаните координати."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Изберете първо отметка"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Източници и типове данни"
-
-#~ msgid "to"
-#~ msgstr "до"
-
-#~ msgid "y from"
-#~ msgstr "y от"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Използвайте мишката или Ctrl+стрелките/./ за мащабиране."
-
-#~ msgid "Download Area"
-#~ msgstr "Област за сваляне"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Свързване с OSM сървър..."
-
-#~ msgid "Create new relation"
-#~ msgstr "Създаване нова релация"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Редактиране на параметри"
-
-#~ msgid "Add Selected"
-#~ msgstr "Добавяне на избраните"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Невъзможно да се установи връзка със сървъра."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Членове: {0}"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Не е добавено още."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Автори: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Слоеве: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Разрешяване конфликти."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Списък промени: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Конфликти: {0}"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Разрешаване на конфликти"
-
-#~ msgid "name"
-#~ msgstr "име"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} се състои от {1} следа"
-#~ msgstr[1] "{0} се състои от {1} следи"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "следа с {0} точка"
-#~ msgstr[1] "следа с {0} точки"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "точка"
-#~ msgstr[1] "точки"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} точка"
-#~ msgstr[1] "{0} точки"
-
-#~ msgid "Length: "
-#~ msgstr "Дължина: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Времеви интервал: "
-
-#~ msgid "Images for {0}"
-#~ msgstr "Изображения за {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Прочитане GPX..."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS Начало: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "текуща разлика: {0} с."
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS Край: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "изображение"
-#~ msgstr[1] "изображения"
-
-#~ msgid "timezone difference: "
-#~ msgstr "разлика в часови пояси: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} в пределите на следата"
-
-#~ msgid "Sync clock"
-#~ msgstr "Синхронизация часовник"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Невъзможен записът на отметките."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Невъзможно прочитането на отметките."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} изтрити.)"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM парола"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM потребителско име (email)"
-
-#~ msgid "Download List"
-#~ msgstr "Свали списък"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Настройване сайтове..."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Адрес"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Настройки на прокси"
-
-#~ msgid "Anonymous"
-#~ msgstr "Анонимно"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Порт"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Потребителско име"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Парола"
-
-#~ msgid "layer not in list."
-#~ msgstr "слоя не е в списъка."
-
-#~ msgid "Set the language."
-#~ msgstr "Избор език."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Грешка при разбор"
-
-#~ msgid "their version:"
-#~ msgstr "тяхна версия:"
-
-#~ msgid "resolved version:"
-#~ msgstr "оправена версия:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} обект има конфликти."
-#~ msgstr[1] "{0} обекти има конфликти."
-
-#~ msgid "my version:"
-#~ msgstr "моя версия:"
-
-#~ msgid "File not found"
-#~ msgstr "Файлът не е намерен"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Всички инсталирани разширения са последна версия."
-
-#~ msgid "No plugin information found."
-#~ msgstr "Информация за разширението не е намерена."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Сваляне на липсващи разширения"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Изтриване \"{0}\" за {1} ''{2}''"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Версия {1}{2}"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Изтриване \"{0}\" за {1} {2}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Изтриване {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Изтриване {1} {0}"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Конфликтиращи релации"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Градуси, минути, секунди"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Online-помощ за JOSM"
-
-#~ msgid "History of Element"
-#~ msgstr "История на елемент"
-
-#~ msgid "gps track description"
-#~ msgstr "Описание на GPS следата"
-
-#~ msgid "Email"
-#~ msgstr "Е-поща"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Качи на OSM..."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Качване на тези промени?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Качване на всички промени на OSM."
-
-#~ msgid "Uploading data"
-#~ msgstr "Качване на данни"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Моля, въведете низ за търсене."
-
-#~ msgid "Downloading..."
-#~ msgstr "Сваляне..."
-
-#~ msgid "optician"
-#~ msgstr "Оптика"
-
-#~ msgid "sports"
-#~ msgstr "спортни"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Редактирай магазин за напитки"
-
-#~ msgid "Charge"
-#~ msgstr "Такса"
-
-#~ msgid "Amenities"
-#~ msgstr "Обществени удобства"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Брой жици"
-
-#~ msgid "unitarianist"
-#~ msgstr "Унитаризъм"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Редактирай ръгби"
-
-#~ msgid "Rugby"
-#~ msgstr "Ръгби"
-
-#~ msgid "Edit Football"
-#~ msgstr "Редактирай американски футбол"
-
-#~ msgid "Football"
-#~ msgstr "Американски футбол"
-
-#~ msgid "intermedia"
-#~ msgstr "средно"
-
-#~ msgid "advance"
-#~ msgstr "напреднали"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Моторни спортове"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Редактирай моторни спортове"
-
-#~ msgid "rugby"
-#~ msgstr "ръгби"
-
-#~ msgid "football"
-#~ msgstr "футбол"
-
-#~ msgid "bicyclemap"
-#~ msgstr "карта на веломаршрути"
-
-#~ msgid "board"
-#~ msgstr "информативна дъска"
-
-#~ msgid "citymap"
-#~ msgstr "карта на града"
-
-#~ msgid "hikingmap"
-#~ msgstr "карта туристически маршрути"
-
-#~ msgid "map"
-#~ msgstr "карта"
-
-#~ msgid "Accomodation"
-#~ msgstr "Настаняване"
-
-#~ msgid "Edit Station"
-#~ msgstr "Редактирай станция"
-
-#~ msgid "Shop"
-#~ msgstr "Магазин"
-
-#~ msgid "park_and_ride"
-#~ msgstr "паркинг за прехвърляне на обществен транспорт"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Хидротехническо съоръжение"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Подвижен мост"
-
-#~ msgid "Portcullis"
-#~ msgstr "Падаща решетка"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Черен път 5-ти клас"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Черен път 3-ти клас"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Черен път 2-ри клас"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Черен път 1-ви клас"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Черен път 4-ти клас"
-
-#~ msgid "Cycleway"
-#~ msgstr "Велоалея"
-
-#~ msgid "Bridleway"
-#~ msgstr "Алея за езда"
-
-#~ msgid "Boat"
-#~ msgstr "Лодка"
-
-#~ msgid "Motorboat"
-#~ msgstr "Моторна лодка"
-
-#~ msgid "Goods"
-#~ msgstr "лек камион (до 3.5т)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "подложка Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Слой на мрежата:"
-
-#~ msgid "Grid layout"
-#~ msgstr "Подредба на мрежата"
-
-#~ msgid "standard"
-#~ msgstr "стандартен"
-
-#~ msgid "Navigation"
-#~ msgstr "Навигация"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Въртене на мрежата"
-
-#~ msgid "World"
-#~ msgstr "Светът"
-
-#~ msgid "Help / About"
-#~ msgstr "Помощ / За модула"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Помощ за модула WMS"
-
-#~ msgid "help"
-#~ msgstr "помощ"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Начална точка на мрежата"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Възникна грешка"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Настройване позицията на WMS слоя"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Можете да добавяте, редактирате или изтривате WMS елементи в WMS plugin "
-#~ "Preference Tab - те ще се появят в меню WMS.\n"
-#~ "\n"
-#~ "Можете да направите това и ръчно в \"Разширени Настройки\" (Advanced "
-#~ "Preferences), използвайки следната схема:\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"
-#~ "Примен на пълен WMS URL входен формат (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"
-#~ "За Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , ще се "
-#~ "нуждаете да въведете съответно подходящо 'id'.\n"
-#~ "За да добавите Metacarta Map Rectifier меню елемент, ръчно създайте URL "
-#~ "по примера по-долу, заменяйки 73 с вашето 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: Гледайте изображенията да са подходящи, освободени от copyright "
-#~ "ограничения, ако има съмнения, по-добре не използвайте."
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Сваляне на WMS квадранти от {0}"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Настройки модул WMS"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Въведете име на меню и WMS URL"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Промяна списъка с WMS сървъри показвани в менюто на WMS разширението"
-
-#~ msgid "Copy Default"
-#~ msgstr "Копирай стойностите по подразбиране"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Моля изберете ред за копиране."
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (по подразбиране)"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender опции"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier image id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Сваляне трансформирано изображение от Metacarta's Map Rectifier WMS"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Моля, изберете потребител използвайки панела на авторите"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Извинете, за анонимни потребители това е недостъпно"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Замени селекцията с потребителски данни"
-
-#~ msgid "Please select some data"
-#~ msgstr "Моля изберете някакви данни"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Отовори потребителската страница в браузър"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Избери потребителски данни"
-
-#~ msgid "Open User Page"
-#~ msgstr "Отовори потребителската страница"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Показване на панела автори"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Редактиране трудна планинска туристическа пътека"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Алпийска туристическа пътека"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Редактиране алпийска туристическа пътека"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Редактиране туристическа пътека"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Планинска туристическа пътека"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Редактиране планинска туристическа пътека"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Трудна планинска туристическа пътека"
-
-#~ msgid "zoom"
-#~ msgstr "мащаб"
-
-#~ msgid "near"
-#~ msgstr "близо"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Моля задайте низ за търсене"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} остава. Качване {4}: {5} (id: {6})"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Група шаблони ''{0}''"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Празна стойност изтрива ключа."
-
-#~ msgid "Occupied By"
-#~ msgstr "Обект"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Маркери (празна стойност изтрива маркера)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Добавяне на всички текущо обекти като членове"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Натиснете \"Презареди\" за обновяване на списъка"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Грешка при разбор на отговора на сървъра."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Възникнаха конфликти при импортване."
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Възстановяване състоянието на всички текущо избрани обекти до версията, "
-#~ "указана в списъка с промени."
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Изтриване на члена от текущия ред на таблицата от тази релация"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Показване/скирване на Текст/Икони"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Има несъхранени промени. Изтриване на слоя въпреки това?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Искате ли наистина да изтриете целия слой?"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Изтриване избрания слой."
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Обединяване текущия слоя с долния."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Обнови списъка с избраните."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Часова зона на GPS устойството (разлика със снимките)"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Не е намерено изображение с информация за времето."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Липсва EXIF време във файла \"{0}\"."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Не е указано време за точка {0} x {1}"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Синхронизиране времето с GPS приемника"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Въведенето време не може да бъде използвано."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Основен URL адрес на OSM сървъра (REST API)"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Редактиране на нова релация"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Редактиране релация #{0}"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Потребителско име (email) за OSM акаунт."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата "
-#~ "парола."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Основен URL адрес на сървъра"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Използване на вградените настройки"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ВНИМАНИЕ: Паролата се съхранява в обиковен текст във файла с "
-#~ "настройките.<br>Паролата се предава като обикновен текст до сървъра, "
-#~ "включена в URL адрес.<br><b>Не използвайте ценна парола.</b></html>"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Съхраняване резервни копия"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Източник на шаблони за маркиране"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Добавяне или на site-josm.xml, или на Wiki страници."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Източници на шаблони за маркиране"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Източник (URL или име файл) на файлове с дефиниции на шаблони за "
-#~ "маркиране. Вижте http://josm.openstreetmap.de/wiki/TaggingPresets за "
-#~ "подробности."
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Добавяне на нов източник на шаблони за маркиране към списъка."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Използване на прокси-сървър"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Създаване на не-аудио маркери при четене GPX."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr ""
-#~ "Само интересните указатели на посока (примерно, при еднопосочни пътища)."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Максимално разстояние (в метри), за съединяване с линии. Сложете -1, за "
-#~ "да се рисуват всички линии."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Благодарим за разбирането</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Моля обърнете внимание, че бързите клавиши са присъединени към "
-#~ "действия по време на стратиране на JOSM. Така че ще е необходим "
-#~ "<b>рестарт</b> на JOSM за да видите промените.</p>"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Освен това, бързите клавиши се активират, когато действията се "
-#~ "присъединяват към елементи на менютата или бутони за първи път. Затова "
-#~ "някои от промените може да станат активни дори и без рестартиране --- но "
-#~ "и без управление на конфликтите. Това е още една причина за "
-#~ "<b>рестартиране</b>на JOSM след като завършите с промените тук.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Може да забележите, че в списъка за избор на клавиши на следващата "
-#~ "страница има всички клавиши, които съществуват по всякакви клавиатури за "
-#~ "които знае Java, а не само тези, които съществуват на вашата клавуатура. "
-#~ "Моля, използвайте само тези стойности, които отговарят на реален клавиш "
-#~ "на вашата клавиатура. Така че ако клавиатурата ви няма 'Copy' клавиш (PC "
-#~ "клавиатурите нямат, Sun клавиатурите имат), то не го използвайте. Също ще "
-#~ "има и 'клавиши' , които отговарят на клавишни комбинации на вашата "
-#~ "клавиатура (примерно ':'/Двуеточие). Моля не ги използвайте и тях, "
-#~ "използвайте базовия клавиш вместо това (';'/Точка и запитая на US "
-#~ "клавиатура, '.'/Точка на Немска клавуатура, ...). Ако не спазвате това, "
-#~ "може да настъпят конфликти, тъй като за  JOSM няма начин да знае, че Ctrl"
-#~ "+Shift+; и Ctrl+: представляват всъщност една и съща комбинация на US "
-#~ "клавиатура...</p>"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Отваряне на файл (како GPS данни, ако е .gpx)"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>Последната страница показва списък на клавиши-модификатори, които JOSM "
-#~ "автоматично ще присъедини към бързи клавишни комбинации. За всеки от "
-#~ "четирите вида бързи клавишни комбинации има три алтернативи. JOSM ще се "
-#~ "опита да използва тези алтернативи в показания ред, когато разрешава "
-#~ "конфликти. Ако всички алтернативи водят до комбинации, които вече са "
-#~ "заети, ще бъде определен произволна друга свободна комбинация вместо това."
-#~ "</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>Псевдо-модификатор 'изключено' ще изключва бърза клавишна комбинация.</"
-#~ "p>"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Параметрите се прочитат в реда, в който са указани, затова се убедете\n"
-#~ "че зареждате данни преди --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Вместо --download=<bbox> може да укажете osm://<bbox>\n"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Активиране обновените разширения"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Грешка при активиране на обновените разширения. Проверете дали JOSM има "
-#~ "право да презаписва текущите."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Разширението не може да бъде изтрито. Моля съобщете на разработчиците на "
-#~ "JOSM за този проблем."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Разширение {0} се изисква от разширение {1}, но не беше открито."
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Сваляне на следните разширения?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Обновяване на следните разширения:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Грешка при изтриването на файл на разширение: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Разширението вече съществува"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Премахване на член в релация"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Грешка при четене на файла с описанието на разширението: {0}"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Не е намерен път \"до\"."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Повече от един път \"до\" са намерени."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Повече от един път \"от\" са намерени."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Неизвестен тип членство за ''{0}''."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Пътя ''{0}'' е с по-малко от две точки."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Не е намерен път \"от\"."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Неизвестна роля ''{0}''."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Липсва външен път за мултиполигон ''{0}''."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Стилът за външния път ''{0}'' се разминава."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Не-Път ''{0}'' в мултиполигон."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Вътрешният път ''{0}'' се намира отвън."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Стил за ограничение {0} не е намерен."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Грешка: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Предупреждение: {0}"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Не прилагай  промените"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "В релацията има член ''{0}'', който е бил изтрит."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "В релацията има празен член."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "мултиполигонен път ''{0}'' не е затворен."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Архив с разширението вече съществува. Да се свали ли текущата версия и да "
-#~ "се се изтрие съществуващия архив?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Път, обознаващ граница на област, не е затворен."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Не може да се отвори директорията с предпочитания: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Файла с предпочитания е повреден. Възстановяване от старо копие в {0}."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Проекцията \"{0}\" е разработена само\n"
-#~ "за широчини между 46.1° и 57°.\n"
-#~ "Използвайте друга проекция, ако не използвате\n"
-#~ "френски WMS server. Не качвайте \n"
-#~ "никакви данни на сървъра след това съобщение."
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Ламбертова зона (Франция)"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "ВАЖНО : данните са позиционирани прекалено далеч \n"
-#~ "от границите на текущата Ламбертова зона.\n"
-#~ "Не качвайте на сървъра никакви данни след\n"
-#~ "това съобщение. Върнете назад последното \n"
-#~ "си действие, съхранете вашата работа и\n"
-#~ "започнете нов слой в новата зона."
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Вие се каните да изтриете възли, намиращи се извън зоната, която сте "
-#~ "свалили от сървъра.<br>Това може да предизвика проблеми, защото други "
-#~ "обекти (които не виждате) може да ги използват.<br>Наистина ли искате да "
-#~ "ги триете?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Разрешаване {0} конфликти в {1} обекти"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Селекцията \"{0}\" се използва от релация \"{1}\".\n"
-#~ "Изтриване от релацията?"
-
-#~ msgid "Split way segment"
-#~ msgstr "Разделяне пътен сегмент"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Грешка при NMEA импортиране!"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Неправилно съставено изречение: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Неизвестно изречение: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Грешка в контролните суми: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Нулеви координати: "
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Обединяване на линии, влизащи в различни релации?"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Въведете стойности за всички конфликти."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Избраните пътища имат различни участия в релации.  Въпреки това искате ли "
-#~ "да ги обеденим?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Всички линии бяха празни"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Моля, изберете точно три точки или един сегмент с три точки."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Точките не са разположени по кръг"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Нито една от тези тези линии не е прикрепена за други"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Моля изберете поне един тип данни за сваляне."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Дублирай {0} точки в {1} точки"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Показване на историческа информация за OSM обекти."
-
-#~ msgid "Create a new map."
-#~ msgstr "Създай нова карта."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Моля, изберете поне две точки за обединение."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Обединяване точки от различни релации?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Точките не могат да се обединят: Ще трябва да се изтрие линия, който вече "
-#~ "се използва."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Има неразрешени конфликти. Първо трябва да ги разрешите."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Неизвестно файлово разширение."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Няма отворени документи. Няма какво да се съхранява."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Вътрешна грешка: невъзможно да се проверят условията без слой. Моля, "
-#~ "информирайте за тази грешка."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Невъзможно да се създаде резервно копие."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Възникна грешка при възстановяване на резервно копие."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Възникна грешка при записване."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Отваряне страница с предпочитания за глобалните параметри."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Не може да се преименува файла \"{0}\"."
-
-#~ msgid "Play next marker."
-#~ msgstr "Възпроизвеждане на следващия маркер."
-
-#~ msgid "Next Marker"
-#~ msgstr "Следващ маркер"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Предишен маркер"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Възпроизведи предишния маркер."
-
-#~ msgid "Jump forward"
-#~ msgstr "Прескочи напред"
-
-#~ msgid "Jump back."
-#~ msgstr "Прескочи назад."
-
-#~ msgid "Load Selection"
-#~ msgstr "Зареди избраното"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Свързване с {0}..."
-
-#~ msgid "Slower Forward"
-#~ msgstr "По-бавно възпроизвеждане"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Грешка на разбор от URL: \"{0}\""
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Липсват параметри за \"НЕ\"."
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Липсват параметри за \"ИЛИ\"."
-
-#~ msgid "Faster Forward"
-#~ msgstr "По-бързо възпроизвеждане."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Грешка при четене от адрес URL: \"{0}\""
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Baker Street</b> - 'Baker' и 'Street' в кой да е ключ или име."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в кой да е ключ или име."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' където и да е в името."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - няма 'Bak' в името."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Липсва затваряща скоба."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - обекти с даденото ID"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - обекти с дадено количество възели / точки"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Използвайте <b>\"</b> за да изключите в кавичките операторите (примерно, "
-#~ "ако ключ съдържа двоеточие)"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Селекцията трябва да се състои само от линии."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Моля, изберете един или повече затворени пътя, състоящи се от поне 4 "
-#~ "точки."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Някои от точките са (почти) на една права"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Само два точки е позволено да бъдат избрани"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr ""
-#~ "Преместване на точките, така че аглите между линиите да са 90 или 270 "
-#~ "градуса"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Използвате проеция EPSG:4326, което може да доведе <br>до нежелани "
-#~ "резултати, когато се прави изправяне на ъгли.<br>Променете вашата "
-#~ "проекция за да не се появява повече това предупреждение.<br>Желаете ли да "
-#~ "продължите?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Само една точка е избрана"
-
-#~ msgid "No data imported."
-#~ msgstr "Никакви данни не са импортирани"
-
-#~ msgid "Data Layer"
-#~ msgstr "Слой с данни"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Отваряне в браузър"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Избиране, преместване и завъртане на обекти"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "Възможно е да се редактират само справочните страници на JOSM Online Help"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Грешка при зареждане на страница {0}"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Натиснете за изтриване. Shift: изтриване на сегменти от път. Alt: за да "
-#~ "не изтрива неизползваните възли при изтриване на път. Ctrl: изтриване на "
-#~ "обекти, към които има обръщение."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Нарисувай сегмент от път за да се образува правоъгълник."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Използване на десетични градуси."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Въведете координати за новата точка."
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Всички нови линии са включени към релацията на база роля.\n"
-#~ "Трябва да проверите това и при необходимост да внесете корекции."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Отрицателни стойности обозначават западното/южното полукълбо"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Избрано така прави вашата следа публичка в openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Публична"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "No password provided."
-#~ msgstr "Не е посочена парола."
-
-#~ msgid "No username provided."
-#~ msgstr "Не е посочено потребителско име."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Импортиране на TCX файл като GPS следа"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Импортиране на TCX Файл..."
-
-#~ msgid "Slippy Map"
-#~ msgstr "Интерактивна карта"
-
-#~ msgid "Request Update"
-#~ msgstr "Изискване на обновяване"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Показване статуса на квадрант"
-
-#~ msgid "requested: {0}"
-#~ msgstr "изискани: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "грешка при изискване на обновяване"
-
-#~ msgid "error loading metadata"
-#~ msgstr "грешка при зареждане на метаданните"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Източници на квадранти"
-
-#~ msgid "image not loaded"
-#~ msgstr "изображението не е заредено"
-
-#~ 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 ""
-#~ "Избрания път(ища) имат възли извън района на свалените данни.\n"
-#~ "Това може да доведе до нежелано изтриване на възли, свързани с други "
-#~ "пътища.\n"
-#~ "Сигурни ли сте че искате да продължите?"
-
-#~ 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] ""
-#~ "Селекцията се състои от {0} път. Сигурни ли сте че искате да го опростите?"
-#~ msgstr[1] ""
-#~ "Селекцията се състои от {0} пътя. Сигурни ли сте че искате да ги "
-#~ "опростите?"
-
-#~ msgid "start"
-#~ msgstr "начало"
-
-#~ msgid "end"
-#~ msgstr "край"
-
-#~ msgid "All images"
-#~ msgstr "Всички изображения"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Добавяне на нов слой"
-
-#~ msgid "Zone"
-#~ msgstr "Зона"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Ламбертова зона"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Данните съдържат грешки. Да се качват ли въпреки това?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Поправяне на избраните грешки."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Игнориране на избраните грешки в бъдеще."
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Невъзможно да бъде създаден нов бъг. Резултат: {0}"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr ""
-#~ "Дублирането на бърз клавиш за бутона '{0}' - бутона ще бъде игнориран!"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Един от избраните файлове е празен !!!"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Отворяне на OpenStreetBugs прозорец и активирай автоматичното сваляне"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Геомаркирани картинки"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Показване на геомаркирани фотографии"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} открити с gps тагове."
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Изображението няма EXIF позиция"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Няма още маркирани изображения"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Мога да фотографирам екрана на моя GPS приемник.<br>Това може ли да "
-#~ "помогне?</html>"
-
-#~ msgid "Update position for: "
-#~ msgstr "Обновяване позицията на: "
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Намирам се в часовата зона: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Отваряне друга снимка"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Отваряне на изображения с AgPifoJ..."
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX Следата е заредена"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Индекс на посоката '{0}' не е намерен"
-
-#~ msgid "change the viewport"
-#~ msgstr "промяна областта видима на екрана"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "ръчно потвърждаване на всички действия на дистанционното управление"
-
-#~ msgid "load data from API"
-#~ msgstr "зареждане данни от API"
-
-#~ msgid "change the selection"
-#~ msgstr "промяна на селекцията"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Разширение, което позволява JOSM да бъде управляван от други приложения."
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Зареждане на изображение от френски кадастърен WMS"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Разширението за дистанционно управление винаги слуша на порт 8111 на "
-#~ "localhost. Портът е постоянен, защото към него се обръщат външни "
-#~ "приложения за да се свързват с него."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Позволени действия"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Настройки на разширението за дистанционно управление"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Мащабиране: с колелцето на мишката или двойно щракване. Преместване на "
-#~ "картата: Задръжте десния бутон на мишката и движете.   Избор: Щракане."
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Отваряне първо на слой (GPX, OSM, кеш)"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Ламбертова зона 4 кеш файл (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Ламбертова зона 1 кеш файл (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Ламбертова зона 3 кеш файл (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Ламбертова зона 2 кеш файл (.2)"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Задаване ръчно на Ламбертова зона (напр. за местоположения между две зони)"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Избор на Tableau d'Assemblage"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Специален доставчик на френски кадастров wms на www.cadastre.gouv."
-#~ "fr<BR><BR>Моля прочетете правилата и условията за ползване оттук (на "
-#~ "френски): <br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR> преди да качвате каквито "
-#~ "и да са данни създадени с това разширение."
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Множител при улавяне на изображения:"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Източник на автомат.-маркери добавен:"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Ламбертова зона {0} в кеша е несъвместима с текущата Ламбертова зона {1}"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Проверяване на избранато или всички данни."
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Дадения тест проверява, дали два пътя, ЖП линии или воднипътища се "
-#~ "пресичат на едно и също ниво, без да са свързани с общ възел."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Немаркирани или несвързани точки"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Неправилна комбинация маркер/стойност"
-
-#~ msgid "Painting problem"
-#~ msgstr "Проблем с изобразяването"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Проверява дали картата при русиване е открила грешки в данните."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Проверка за бележки при рисуване."
-
-#~ msgid "Grid"
-#~ msgstr "Мрежа"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Повтарящи се линии"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Дублиране на избраните пътища."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Създаване на копие на път"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Невъзможно да се създаде копие на неподредена линия."
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Задаване {0}={1} за {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Задаване {0}={1} за {2} {3}"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "За да включите кадастровия WMS plugin, променете\n"
-#~ "проекцията на JOSM до Ламбертова и рестартирайте"
-
-#~ msgid "Station"
-#~ msgstr "Гара / Станция / Спирка"
-
-#~ msgid "Footway"
-#~ msgstr "Алея / Тротоар"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Запис и Изход"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Изтриване на избраното"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Изтриване на всички текущи избрани обекти от релацията"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Настройте позицията на избрания WMS слой"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Център на растера: {0}"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Макс.височина (метри)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "макс.ширина (метри)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "макс.дължина (метри)"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Градът {0} не е открит или не е достъпен в WMS.\n"
-#~ "Моля проверете наличността на www.cadastre.gouv.fr"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Екстракт на белезите на сграда"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Изтриване на слой"
-
-#~ msgid "Login"
-#~ msgstr "Вход"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Изтриване и Зареждане"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Комбиниране въпреки всичко"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Зареждане на разширенията"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Сливане въпреки всичко"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Разрешаване на конфликти"
-
-#~ msgid "autozoom"
-#~ msgstr "автомащабиране"
-
-#~ msgid "autoload tiles"
-#~ msgstr "автозараждане квадранти"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Настройки на разширение SlippyMap"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Авто мащаб: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Автозареждане Квадранти: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Макс.мащаб ниво: "
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Само до две области могат да бъдат свързани към момента."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Продължи"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "ТОВА Е ЕКСПЕРИМЕНТАЛНО. Записвайте вашата работа и проверявайте преди "
-#~ "качване."
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Не са открити пресичания. Нищо не е променяно."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Моля, изберете поне един затворен път който да бъде присъединен."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" не е затворен и съответно не може да бъде съединен."
-
-#~ msgid "Move Down"
-#~ msgstr "Преместване надолу"
-
-#~ msgid "Move Up"
-#~ msgstr "Преместване нагоре"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Редактор релации: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Разрешаване конфликт"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Повече от един \"през\" са открити."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Оцветява точките и сегменти от следи според неточността на позицията "
-#~ "(HDOP). Вашият приемник трябва да поддържа запис на този тип информация."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Не е открит възел или път \"през\"."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Моля изберете поне една точка, път или релация. Само вече качени елементи "
-#~ "имат история."
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Променете първо проекцията до {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Невалидна проекция"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Това действие ще изисква {0} индивидуални запитвания за сваляне. Желаете "
-#~ "ли да продължите?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Обновяване на текущия слой с данни от сървъра (презареждане на данните)"
-
-#~ msgid "Update Data"
-#~ msgstr "Обновяване на данните"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Преместване на обекти чрез драгване; Shift за добавяне към селекция (Ctrl "
-#~ "за превкл.); Shift-Ctrl за обхождане на селекцията; или смяна на "
-#~ "селекцията"
-
-#~ msgid "Fade background: "
-#~ msgstr "Фон при избледняване: "
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Снимките не съдържат времева информация"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Открити {0} съвпадения на {1} в GPX следа {2}"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Избраните снимки не съдържат времева информация."
-
-#~ msgid "Default Values"
-#~ msgstr "Стойности по подразбиране"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Времева разлика от {0} дни)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Съотнесени {0} от {1} снимки към GPX следа."
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Възникна грешка при опит да се съотнесат снимките към GPX следата. Може "
-#~ "да промените настройките на ръчно съотнасяне на снимки."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Разминаване между следата и снимките: {0}мин {1}сек"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Не са открити данни за обновяване. Отваряли или зареждали ли сте слой с "
-#~ "данни?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Следните грешки възникнаха при масово сваляне:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Грешки при Сваляне"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Редактиране на информационен пункт"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Изберете един затворен път от поне четири възела."
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Водач"
-
-#~ msgid "Map Type"
-#~ msgstr "Тип карта"
-
-#~ msgid "Board Type"
-#~ msgstr "Тип табло"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Редактирай черен път 1-ви клас"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Редактирай черен път 2-ри клас"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Редактирай черен път 3-ти клас"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Редактирай черен път 4-ти клас"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Редактирай черен път 5-ти клас"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Трудна алпийска туристическа пътека"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Редактиране трудна алпийска туристическа пътека"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Екстремна алпийска туристическа пътека"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Редактиране екстремна алпийска туристическа пътека"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Редактирай подвижен мост"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Редактирай падаща решетка"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Редактиране летище"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Превключване изглед на цял екран"
-
-#~ msgid "Full Screen"
-#~ msgstr "Пълен екран"
-
-#~ msgid "Optional"
-#~ msgstr "Незадължително"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- изпълняващата се версия е {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или "
-#~ "<A HREF=\"{1}\">на вашия език</A>."
-
-#~ msgid "Add grid"
-#~ msgstr "Добавяне на мрежа"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Още едно geotag разширение за JOSM. Свързва снимки с GPS следи или "
-#~ "импортира EXIF гео-маркирани снимки."
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr "Специален handler за френския поземлен регистър WMS сървър."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Позволява на други приложения да изпращат команди към JOSM."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Показва подвижна картна мрежа в JOSM. Може да зарежда квадранти "
-#~ "(изображения) от подвижната карта във фонов режим и да изисква обновления."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Предоставя фонов слой, показващ мрежа на картата."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Основното качество на разширението е възможността за изтриване на точки "
-#~ "от GPX следи. Това разширение може да се използва да подготви следа за "
-#~ "качване на OSM, примерно чрез изтриване на неинтересните части от следата."
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Дублира път с отместване."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Инструменти за работа с автори/потребители. Избиране картови данни, които "
-#~ "принадлежат на определен потребител, отваря браузър с профила на избран "
-#~ "автор."
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Още едно разширение за съвпадане снимки към точки от GPX файл. Съвпадение "
-#~ "става, когато 'name', 'cmt' или 'desc' атрибута на waypoint от маршрута "
-#~ "съвпада с името на файла на снимката."
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Симулира клик когато направите малко и кратко провлачване (драг). Това е "
-#~ "полезно за писалки на таблеки, когато имате проблем само да кликнете, без "
-#~ "да преместите позицията (основен проблем между Java и таблети)."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Показва OpenLayers фоново изображение"
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Директно зареждане на TCX файлове от JOSM."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Няколко помощни инструмента, които облекчават живота: например "
-#~ "опрастяване на път, присъединяване на области, прескачане до позиция."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Проверява валидността на OSM данните. Проверява за проблеми и предоставя "
-#~ "решения за някои от тях. Интегирана е и проверка за правилното изписване "
-#~ "имената на маркерите."
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr "Показва гео-изображения като фон в JOSM (WMS сървъри, Yahoo, ...)."
-
-#~ msgid "Start routing"
-#~ msgstr "Започни маршрутизиране"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Премахване на възли от маршрут"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Натисни и влачи за преместване на възли от маршрут"
-
-#~ msgid "<multiple>"
-#~ msgstr "<няколко>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Присъедини области: премахване на кратки пътища"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Свързана само-пресичаща се област"
-
-#~ msgid "Closed Way"
-#~ msgstr "Затворен Път"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Натиснете за добавяне на възли към маршрут."
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Поддържа версии на протокола 0.5 и 0.6, докато сървъра казва че поддържа "
-#~ "от {0} до {1}."
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Версията липсва от OSM данните."
-
-#~ msgid "Not initialized"
-#~ msgstr "Не е инициализирано"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Качването на данни неуспя по неизяснена причина"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Не може да се прочетат числова стойност от отговора"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Неизвестна версия: {0}"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Проекция \"{0}\" е предназначена за\n"
-#~ "географски широчини между 45.7° и 47.9°\n"
-#~ "и географски дължини между 5.7° и 10.6° само.\n"
-#~ "Използвайте друга проекция, ако не работите\n"
-#~ "върху данни от Швейцария или Лихтенщайн.\n"
-#~ "Не качвайте никакви данни след това съобщение."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Максимална дължина (в метри) за рисуване на линии за локални файлове. "
-#~ "Задайте '-1' за чертаене на всички линии."
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Няма съществуващ набор промени за качване на разлики"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Възстановяне от изтриване на път..."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Проекцията не може да се прочете от настройките. Ще използваме Меркатор."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A> "
-#~ "или на <A HREF=\"{1}\">вашият език</A>."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Проверка дали възел {0} е заминал..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Възстановяване от изтриване на релация..."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Да, възстанови от изтриване също"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Не, отказване на операцията"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Има {0} допълнителни възли използвани от {1}<br>които са изтрити на "
-#~ "сървъра.<br><br>Желаете ли да възстановим и тези възли също?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Възстановяване на изтрити допълнителни възли?"
-
-#~ msgid "Keep mine"
-#~ msgstr "Запази моят"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Проверка дали примитив {0} е заминал..."
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Възстановяване след изтриване на свързани примитиви?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Има {0} допълнителни примитиви използвани от релация {1}<br>които "
-#~ "са изтрити на сървъра.<br><br>Желаете ли да ги възстановим и тях също?</"
-#~ "html>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Изтриване на моите"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
-
-#~ msgid "API initialization failed"
-#~ msgstr "Неуспешна иницилизация на API"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: Неочакван формат на базовия URL на API. Пренасочването "
-#~ "към страницата с историята на OSM вероятно ще е невъзможно. Базов URL на "
-#~ "API: \"{0}\""
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Зареждане родителите на примитива {2}"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "Параметърът {0} не трябва да е празен"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Конфликт в данните"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Предупреждение: автоматически е премахнат етикета ''{0}'' на изтрития "
-#~ "примитив {1}"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Текущият брой на промените надхвърля максималния. Текущ брой - {0}, "
-#~ "максимален - {1}."
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Невъзможност да се инициализира API. Моля, пробвайте по-късно."
-
-#~ msgid "Update Selection"
-#~ msgstr "Обновява избраното"
-
-#~ msgid "No data"
-#~ msgstr "Липсват данни"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Няма избрани примитиви за обновяване."
-
-#~ msgid "Uploading"
-#~ msgstr "Качване"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Обновява текущо избраните примитиви от сървъра."
-
-#~ msgid "Updating primitive"
-#~ msgstr "Обновяване на примитива."
-
-#~ msgid "File could not be found."
-#~ msgstr "Файлът не може да бъде намерен."
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: Стартират се прозорци за преглед само на първите {0} от "
-#~ "всичките {1} избрани примитиви."
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Дължината на стойността за етикет ''{0}'' на примитива {1} превишава "
-#~ "максимално позволената дължина {2}. Дължината на стойностите е {3}."
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Не могат да се намерят примитиви с ID {0} в текущата база данни."
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Сваляне на референтните данни от OSM."
-
-#~ msgid "Update failed"
-#~ msgstr "Неуспешно обновяване."
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Грешка при обновяването на избраните примитиви."
-
-#~ msgid "Conflict detected"
-#~ msgstr "Забелязан е конфликт."
-
-#~ msgid "Missing primitive"
-#~ msgstr "Липсва примитив."
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Синхронизирани само {0} {1}"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "неочаквана върната стойност {0}"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Изтегляне на примитиви отнасящи се до един от избраните примитиви."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Изтегляне на референтни точки..."
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Предупреждение: Началната част \"{0}\" не отговаря на очаквания шаблон "
-#~ "\"{1}\"!"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон "
-#~ "\"{1}\""
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Качването към OSM API пропадна."
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Грешка при установяване на връзка със сървъра на OSM {0}.\n"
-#~ "Проверете URL на сървъра в настройките и Вашата интернет връзка."
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Примитивът вече е изтрит."
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Следните грешки възникнаха при масовото сваляне на данни."
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Местите повече от {0} елемента. Преместването на такова голямо количество "
-#~ "елементи често е грешка.\n"
-#~ "Да се преместят ли наистина?"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Синтактична грешка: Шаблонът {0} в {1} е недопустим!"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Промени {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Добави {0} {1}"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Грешка по време на връзката със сървъра."
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Изчистване на 1 примитив"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr ""
-#~ "невъзможно е разрешаването на конфликт, за който няма предложено решение."
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "параметърът {0} трябва да е > 0. Сега е {1}"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Отмяна изтриването на {0} примитива."
-
-#~ msgid "changeset"
-#~ msgstr "набор промени"
-
-#~ msgid "changesets"
-#~ msgstr "набори от промени"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Качването <strong>пропадна</strong> защото примитивът, който се "
-#~ "опитахте<br> да изтриете на съсрвъра вече е изтрит там."
-#~ "<br><br>Съобщението за грешка е:<br>{0}</html>"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Изтрити или преместени примитиви"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Грешен брой параметри на оператора за точки."
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "роля {0} не участва в двойката за сравнение {1}"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "списъкът в роля {0} понастоящем не участва в двойка за сравнение"
-
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Невъзможен достъп до системната стойност ''{0}'' поради настройките за "
-#~ "сигурност. Съобщение: {1}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Проблеми при свалянето"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Обединява текущо избраните примитиви в друг слой"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Невъзможно прочитането на файла ''{0}''. Грешката е: <br>{1}</html>"
-
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr "Възникна грешка при записа. Грешката е: {0}"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br> Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Възникна грешка при въстановяването на бекъп файла.<br> Грешката е: "
-#~ "<br>{0}</html>"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Не е намерен примитив с id {0} в текущия набор от данни"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - ключ 'type' със стойност именно 'route'."
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Активирай за качване на всички промени в една заявка, Изключи за "
-#~ "използване на заявка за всяка променена примитива"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "качва всички промени в една заявка"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Не може да се търси защото няма заредени данни"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "Следните грешки се получиха по време на масовото сваляне:{0}"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "вече регистриран конфликт за примитив ''{0}''"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "няма намерена последна версия. Историята е празна."
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "няма намерена по-ранна версия. Историята е празна."
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Tags({0} конфликти)"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} чакащи tag конфликти за разрешаване"
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - ключ 'type' с произволна стойност. Също пробвайте "
-#~ "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Некоректна стойност на id оператора: {0}. Очаквано е число."
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Внимание: слоя ''{0}'' вече не съществува. Не може да се разреши конфликт "
-#~ "за примитив ''{1}''"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Предупреждение: Път {0} се премахва, защото броят на точките е под 2. "
-#~ "Текуща стойност - {1}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "премахване на справка от път {0}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е "
-#~ "наличен вече"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Слой ''{0}'' вече има конфликт за примитива<br>''{1}''.<br>Този "
-#~ "конфликт не може да бъде прибавен.</html>"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Разрешаване на конфликтите във версиите за {0} {1}"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Зона {0}"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Не могат да се получат резултати от търсене от сървъра"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "точка {0} не е открита в списъка"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Преместване на избраните елементи надолу с една позиция"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "параметърът '{0}' не трябва да е празен"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr ""
-#~ "Освобождаване на списъка обединени елементи и стартиране на обединяването"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Фиксиране  на текущия списък обединени елементи"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Връзката със сървъра пропадна"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "не е видимо (на сървъра)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "видимо (на сървъра)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Видимо състояние:"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Физическо изтриване от местната база данни"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Запазване копие на местната версия"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Запазване на тяхното видимо състояние"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Нулирай ID"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Да, изчисти го!"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM ще трябва да премахне вашият местен примитив с ID {0}<br>от "
-#~ "базата данни.<br>Съгласни ли сте?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Премахни от базата данни"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}"
-
-#~ msgid "Confirmation"
-#~ msgstr "Потвърждение"
-
-#~ msgid "History item"
-#~ msgstr "Точка от историята"
-
-#~ msgid "Delete all"
-#~ msgstr "Изтриване на всички"
-
-#~ msgid "No, don't apply"
-#~ msgstr "Не, не прилагай!"
-
-#~ msgid "Linked"
-#~ msgstr "Свързано"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "История за {0} {1}"
-
-#~ msgid "Used style"
-#~ msgstr "Използван стил"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Копиране на подразбиращите се"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Сървърът отговори с код на грешка: {0}"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Добавката {0} не е достъпна. Обновяването е пропуснато."
-
-#~ msgid "More details"
-#~ msgstr "Още подробности"
-
-#~ msgid "image "
-#~ msgstr "изображение "
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Наистина ли искате да изтриете слой ''{0}''?"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Изтриване слой {0} от {1}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Показване историята на избрания примитив"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Зареждане на история за {0} с ID {1}"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "индекс извън границите. Имаме: {0}"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, "
-#~ "въпреки това?"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Премахване на члена {0} {1} от връзката"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "Премахване на отношението от връзката {0}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Избраното - \"{0}\" - се използва от връзка \"{1}\" в роля {2}.\n"
-#~ "Изтриване от връзката?"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Подчинената връзка<br>{0}<br>е изтрита на сървъра. Не може да бъде "
-#~ "заредена."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Сваляне всички непълни пътища и възли от връката"
-
-#~ msgid "Unknown relation member type {0}"
-#~ msgstr "Непознат тип на член от връзка - {0}"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Позволява на потребителя да създава различни цветови схеми и да "
-#~ "превключва между тях. Просто променяте цветовете и създавате нова схема. "
-#~ "Удобно за превключване към бял фон и съответни цветове за по-добра "
-#~ "видимост при ярка дневна светлина. Вижте диалога в настройките на JOSM - "
-#~ "'Настройки на картата' (странно, но истина :-)"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
-#~ "сигурността. Изключение на ОС: {1}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Няма валидна версия от дата ''{0}'' в тази история"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Не е намерен примитив с id = {0} в тази база данни"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "параметърът ''{0}'' не е валиден тип на име, имаме: ''{1}''"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Няма примитив с версия {0} в тази история"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Отметката не може да бъде записана.<br>{0}</html>"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>Отметките не могат да бъдат прочетени.<br>{0}</html>"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Преместване нагоре на избраните елементи с една позиция"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Да, нулирай ID"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Добавката {0} изисква програмата JOSM да бъде обновена до {1}."
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} добавка е успешно свалена. Моля, рестартирайте JOSM."
-#~ msgstr[1] "{0} добавки са успешно свалени. Моля, рестартирайте JOSM."
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "Зареждането на добавката {0} беше заявено, но тя не се изисква повече."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Добавката не е открита: {0}."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Сваляне на информация за добавките от {0} сайт"
-#~ msgstr[1] "Сваляне на информация за добавките от {0} сайта"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Добавката не може да бъде премахната. Вероятно е изключена."
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Разрешаване {0} конфликти в етикетите за {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Разрешаване конфликтите в списъка от връзки на път {0}"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Няма отворен сисък с промени."
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Затваряне на текущия списък с промени..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Затваряне на текущия списък с промени"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Използване на нов списък с промени и затваряне"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: неочакван формат на адреса на API. Пренасочването към "
-#~ "страницата с информация или история за примитивът на OSM вероятно е "
-#~ "невъзможно. Базовият адрес на API е: ''{0}''"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Невъзможно четенето от файла ''{0}''.<br> Грешката е: <br>{1}</html>"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Запис и изтриване"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "за {0} примитив"
-#~ msgstr[1] "за {0} примитива"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Има незапазени промени в {0} слой. Отхвърляне на промените и продължаване?"
-#~ msgstr[1] ""
-#~ "Има незапазени промени в {0} слоя. Отхвърляне на промените и продължаване?"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} обект за промяна:"
-#~ msgstr[1] "{0} обекта за промяна:"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Винаги да се премества и този прозорец да не се показва повече"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Използване на нов списък с промени. Остава отворен."
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "Качване в нов или в съществуващ списък с промени?"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr ""
-#~ "Използване на съществуващия списък с промени {0}. След качване се затваря."
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr ""
-#~ "Използване на съществуващия списък с промени {0}. След качване остава "
-#~ "отворен."
-
-#~ msgid "Bikes"
-#~ msgstr "Колелета"
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Достигнат е краят на реда"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "неуспешно внасяне от TangoGPS!"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WML layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Базовият URL<br>''{0}''<br>за този слой на WMS не завършва нито с "
-#~ "''&'', нито с ''?''.<br>Вероятно това ще доведе до невалидна WMS заявка. "
-#~ "<br>Проверете вашите настройки.<br>Искате ли да се изтеглят изображенита "
-#~ "на WMS въпреки всичко?"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Изберете WMS слой"
-
-#~ msgid "Closing changeset {0}..."
-#~ msgstr "Затваряне списък с промени {0}..."
-
-#~ msgid "Leaving changeset {0} open..."
-#~ msgstr "Списъкът с промени {0} се оставя отворен ..."
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Има неразрешени конфликти в слой ''{0}''.<br>Трябва да ги разрешите."
-#~ "</html>"
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Некоректна стойност на оператора за възли: {0}. Операторът за възли "
-#~ "очаква числова стойност, възел или диапазон, например, 10-20"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Разрешаване конфликт на версиите за възел {0}"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием "
-#~ "ли от релацията?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да "
-#~ "го изтрием ли от релацията?</html>"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "Параметърът {0} не трябва да е празен"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A> "
-#~ "или на <A HREF=\"{1}\">вашият език</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е "
-#~ "наличен вече"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Не е намерен примитив с id = {0} в тази база данни"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Базовият URL<br>''{0}''<br>за този слой на WMS не завършва нито с "
-#~ "''&'', нито с ''?''.<br>Вероятно това ще доведе до невалидна WMS заявка. "
-#~ "<br>Проверете вашите настройки.<br>Искате ли да се изтеглят изображенита "
-#~ "на WMS въпреки всичко?"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Липсва страница с помощ. Създайте я на <A HREF=\"{0}\">английски</A> или "
-#~ "<A HREF=\"{1}\">на вашия език</A>."
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Моля въведете филтър."
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Разрешаване конфликт на версиите за пътища {0}"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Разрешаване на конфликт на версиите за релация {0}"
-
-#~ msgid "H"
-#~ msgstr "С"
-
-#~ msgid "F"
-#~ msgstr "С"
-
-#~ msgid "R"
-#~ msgstr "З"
-
-#~ msgid "A"
-#~ msgstr "Д"
-
-#~ msgid "D"
-#~ msgstr "И"
-
-#~ msgid "Text"
-#~ msgstr "Текст"
-
-#~ msgid "C"
-#~ msgstr "Д"
-
-#~ msgid "I"
-#~ msgstr "И"
-
-#~ msgid "M"
-#~ msgstr "Р"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Параметърът {0} не трябва да е празен"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "неочаквана върната стойност {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "параметърът ''{0}'' не е валиден тип на име, имаме: ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Няма примитив с версия {0} в тази история"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Няма валидна версия от дата ''{0}'' в тази история"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "няма намерена по-ранна версия. Историята е празна."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "няма намерена последна версия. Историята е празна."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "индекс извън границите. Имаме: {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Показване историята на избрания примитив"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Не може да се прочете \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към "
-#~ "интернет."
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Внимание: неуспех при инициализиране на предпочитанията. Директорията за "
-#~ "предпочитания ''{0}'' не е директория."
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "Нищо не е открито в селекцията чрез търсене на ''{0}''"
-
-#~ msgid "Man-Made"
-#~ msgstr "Изкуствени"
-
-#~ msgid "white"
-#~ msgstr "бяло"
-
-#~ msgid "blue"
-#~ msgstr "синьо"
-
-#~ msgid "red"
-#~ msgstr "червено"
-
-#~ msgid "brown"
-#~ msgstr "кафяво"
-
-#~ msgid "black"
-#~ msgstr "черно"
-
-#~ msgid "Travel"
-#~ msgstr "Пътуване"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Обектът ''{0}'' е изтрит"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Изтрити {0} обекта"
-
-#~ msgid "tower"
-#~ msgstr "кула"
-
-#~ msgid "underwater"
-#~ msgstr "подводно"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "Примитив с ID = 0 не може да бъде невидим."
-
-#~ msgid "Update selections"
-#~ msgstr "Обновяване на избраните елементи"
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr ""
-#~ "Качване на всички промени в текущо избраната област на сървъра на OSM"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Очакваше се ID >= 0. Имаме: {0}."
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Параметърът ''{0}'' не трябва да е празен."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "качване на всички промени в текущия слой данни към сървър на OSM."
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Невалиден коментар на заявката за качване"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Качване на данните към вече отворен списък с промени"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Качване на всички промени в една заявка"
-
-#~ msgid "Fix relations"
-#~ msgstr "Поправяне на релации"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Изберете, в случай, че данните трябва да бъдат свалени в нов слой"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Добавени {0} обекта"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Подготовка на примитивите за качване ..."
-
-#~ msgid "gray"
-#~ msgstr "сиво"
-
-#~ msgid "line"
-#~ msgstr "линия"
-
-#~ msgid "minor_line"
-#~ msgstr "второстепенна линия"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Превключване режима на цял екран"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Преглед на цял екран"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" не е затворен и съответно не може да бъде съединен."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Слой ''{0}'' вече има конфликт за примитива<br>''{1}''.<br>Този "
-#~ "конфликт не може да бъде прибавен.</html>"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "Д"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Въведете геогр. ширина в диапазона [-90 .. 90]"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Въведете валидна геогр. дължина в диапазона [-180 .. 180]"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Въведете геогр. дължина в диапазона [-180 .. 180]"
-
-#~ msgid "Download Object..."
-#~ msgstr "Сваляне на обект..."
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Подчинената релация<br>{0}<br>е изтрита на сървъра. Не може да бъде "
-#~ "заредена."
-
-#~ msgid "Download Object"
-#~ msgstr "Сваляне на обект"
+#~ "Списък на обединените елементи. Те ще заместят моите елементи, когато се "
+#~ "приложат решенията за обединяване."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Запазване на техните координати"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Запазване на моите координати"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 26529)
+++ applications/editors/josm/i18n/po/cs.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-21 11:13+0000\n"
 "Last-Translator: Jezevec <Unknown>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:40+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:39+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Nápověda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Varování"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametr \"downloadgps\" neakceptuje jména souborů nebo URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorují se nekorektní URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "(kompatibilní s Java 5).</li></ul>Více informací:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Ukončit JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Pokračovat, zkusit znovu"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -389,6 +390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -415,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -421,7 +422,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -429,5 +431,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -638,5 +640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -885,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -892,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1082,6 +1084,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1232,5 +1234,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1462,6 +1464,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2129,5 +2131,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2449,7 +2451,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Stahuji data"
@@ -2702,7 +2704,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2848,10 +2849,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3013,5 +3014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3612,6 +3613,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Nalezena podezřelá data. Opravdu je nahrát?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3662,40 +3663,40 @@
 msgstr "Změněn uzel {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Odstranit \"{0}\" pro uzel ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Odstranit \"{0}\" pro cestu ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Odstranit \"{0}\" pro relaci ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Nastavit {0}={1} pro uzel ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Nastavit {0}={1} pro cestu ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Nastavit {0}={1} pro relaci ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Odstranit \"{0}\" pro {1} objekt(ů)"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3824,4 +3825,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Potvrďte smazání"
@@ -4135,6 +4137,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4171,7 +4173,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Varování: neočekávané číslo verze JOSM v souboru revizí, hodnota je ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4274,5 +4275,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4376,5 +4377,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4394,8 +4395,8 @@
 msgstr "multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4542,50 +4543,64 @@
 msgstr "WGS84 Geographic"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambertova zóna 4 (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} až {2} stupňů)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Korsika)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC zóna"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambertova zóna CC9 (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estonsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercatorova projekce"
@@ -4610,81 +4625,101 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zóna"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zóna {0} (Polsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Švýcarský Grid"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Lotyšsko TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Zóna UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Sever"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Jih"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Polokoule"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Posunutí 3 000 000m na východ"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Francie (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM Geodesický systém"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4910,45 +4945,45 @@
 msgstr "Tento test kontroluje, jestli multipolygony jsou správné"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Cesta typu plochy není uzavřená"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "multipolygon nemá vnější cestu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Žádný styl pro multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Relace multipolygonu neobsahuje styl"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Styly pro vnější cesty jsou různé"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygon není uzavřený"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Vnitřní cesta multipolygonu je venku"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Křížení mezi cestami v multipolygonu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Žádná použitelná role pro člena multipolygonu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Ne-cesta v multipolygonu"
@@ -5221,5 +5256,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5244,5 +5279,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5253,5 +5288,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5659,5 +5694,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5723,5 +5758,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "silnice"
@@ -5729,5 +5764,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5735,10 +5770,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vodní tok"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
@@ -5748,5 +5783,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5761,5 +5796,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5773,5 +5808,5 @@
 msgstr "veřejná doprava"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6137,5 +6172,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6246,4 +6281,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6349,5 +6385,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6392,10 +6428,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Alternativně můžete zadat <strong>adresu</strong> konkrétní dlaždice "
-"ve formátu <i>přiblížení/x/y</i>, např. <i>15/256/223</i>. Je možné použít i "
-"alternativní formáty <i>přiblížení,x,y</i> nebo <i>přiblížení;x;y</i>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6689,7 +6722,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6934,10 +6967,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Ponechat mé souřadnice"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Ponechat cizí souřadnice"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6993,6 +7026,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7014,6 +7047,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7410,5 +7443,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7648,5 +7681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7860,7 +7893,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "neznámý"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8124,5 +8187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8142,5 +8205,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8157,5 +8220,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Stáhnout nekompletní členy vybraných relací"
@@ -8163,5 +8226,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Stáhnout nekompletní členy"
@@ -8204,5 +8267,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8210,5 +8273,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8408,5 +8471,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8508,5 +8571,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Uživatel"
@@ -9500,5 +9562,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9680,5 +9742,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9824,4 +9886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Pouze sady změn patřící mě"
@@ -9834,4 +9897,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Pouze sady změn patřící uživateli s následujícím jménem"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10118,9 +10187,9 @@
 msgstr "Toto URL dotazu na datové změny není platné"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10130,13 +10199,13 @@
 msgstr[2] "Tato úprava změní {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Prázdná hodnota smaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10149,18 +10218,19 @@
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Změnit hodnoty?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Nahradit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10169,5 +10239,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10178,5 +10248,5 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10186,27 +10256,31 @@
 msgstr[2] "Tato úprava změní až {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10215,62 +10289,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Pozice"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Podívat se informace o tagu na OSM wiki (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Spustit prohlížeč s wiki nápovědou k vybranému objektu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Vyberte relaci v hlavním výběru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Vybrat členy vybrané relace"
@@ -10335,10 +10409,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Upozornění: ignoruji výjimku, protože úloha byla přerušena. Výjimka: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10361,8 +10436,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Stahuji {0} nekompletního potomka {1} rodičovských relací"
-msgstr[1] "Stahuji {0} nekompletní potomky {1} rodičovských relací"
-msgstr[2] "Stahuji {0} nekompletních potomků {1} rodičovských relací"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10710,9 +10784,4 @@
 msgstr "Došlo k  {0} konfliktům během importu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varování: Ignoruji výjimku, protože úkol je přerušen. Výjimka: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10753,11 +10822,4 @@
 msgid "Load relation"
 msgstr "Načíst relaci"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Varování: Ignoruji výjimku, protože úkol byl přerušen. Výjimka byla: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11035,37 +11097,4 @@
 msgstr "Typ"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "neznámý"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11186,20 +11215,20 @@
 msgstr "Koordináty"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Historie pro uzel {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historie pro cestu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Historie pro relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Znovu nahrát historii ze serveru"
@@ -11291,6 +11320,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Sada změn"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11893,8 +11922,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12332,4 +12361,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12355,11 +12385,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12442,38 +12465,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Přizpůsobit barvu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Výchozí"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Zvolit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Jméno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12485,9 +12508,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12495,26 +12518,26 @@
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Délka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Délka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12524,8 +12547,8 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12535,12 +12558,12 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12550,10 +12573,10 @@
 msgstr[2] "{0} cesty, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12561,78 +12584,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Stáhnout poblíž:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "pouze trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "pouze značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "trasy a značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12643,11 +12666,11 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12655,6 +12678,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12664,27 +12687,27 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pojmenované body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importovat zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12694,29 +12717,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import není možný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12822,5 +12845,5 @@
 msgstr "Nalezeny následující problémy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12830,57 +12853,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Automatické přiblížení"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Automaticky načítat dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Nahrát dlaždici"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Zobrazit informace o dlaždici"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Nahrát všechny dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Zvětšit přiblížení"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Zmenšit přiblížení"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Vyprázdnit cache dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "přibližte pro nahrání dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "přibližte pro nahrání více dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "zvětšete přiblížení abyste viděli více detailů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "Na této úrovni přiblížení nejsou žádné dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13425,10 +13456,10 @@
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13437,5 +13468,5 @@
 msgstr[2] "značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13445,21 +13476,21 @@
 msgstr[2] "{0} se skládá z  {1} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Zobrazit text/ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Přepnout viditelnost textu značek a ikon."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synchronizovat audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13467,5 +13498,5 @@
 "Audio je třeba pozastavit v okamžiku, kdy uslyšíte synchronizační impuls."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13473,14 +13504,14 @@
 msgstr "Zvuk zesynchronizován na bodu {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Není možno synchronizovat v již přehrávané vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13504,13 +13535,13 @@
 msgstr "Není možné vztvořit novou zvukovou značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL bylo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Chyba při zobrazování URL"
@@ -14485,82 +14516,82 @@
 msgstr "Barvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Kreslit šipky ve směru jízdy"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Pouze na prvním úseku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Vykreslit segmenty s pořadovými čísly"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykreslit ohraničující box stažených dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykreslovat virtuální uzly v modu výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhlazené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Zobrazovat směr u segmentů cesty."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zobrazovat pořadí u všech segmentů v cestách."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovat hranice dat stažených ze serveru."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14568,15 +14599,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Name (Název)"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Desc(ription) (popis)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Žádný"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14587,48 +14654,40 @@
 msgstr "Všechny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Místní soubory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Žádný"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Vynutit kreslení spojnic mezi GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Kreslit větší GPS body"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -14636,5 +14695,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14658,5 +14717,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14699,5 +14758,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14711,38 +14770,18 @@
 msgstr "Pěší"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Vytvořit značky při čtení GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Rychlé vykreslování (vypadá ošklivě)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Name (Název)"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Desc(ription) (popis)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Obojí"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14751,10 +14790,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Kreslit čáru mezi body GPS."
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14762,10 +14801,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maximální délka lokálních souborů (v metrech)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14774,10 +14813,10 @@
 "kreslení všech linií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximální délka (metrů)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14785,15 +14824,15 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Zobrazovat šipky pro čary spojující GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14801,14 +14840,14 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimální vzdálenost (pixelů)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovat větší tečky pro GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14818,13 +14857,13 @@
 "v kartě vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Obarvovat body a části trasy podle rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14832,27 +14871,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Barvy tras a bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Značení bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15525,10 +15582,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSM vždy poslouchá na adrese localhost na portu 8111. Tento port nelze "
-"změnit, protože se na něj odkazují externí aplikace komunikující s JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15617,5 +15672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reset"
@@ -15894,6 +15949,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Aktualizovat bez dotazu"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16298,5 +16353,5 @@
 msgstr "Nová relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16325,9 +16380,9 @@
 msgstr "Najít předvolby"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Zobrazit pouze aplikovatelné na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Hledat ve značkách (tags)"
@@ -16609,6 +16664,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16933,5 +16988,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -17150,9 +17205,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Chybějící povinné atributy prvku ''bounds''. Nalezeno minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17552,4 +17605,9 @@
 msgstr "Uložit uživatelské jméno a heslo (nezašifrované)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18398,4 +18456,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18517,4 +18577,18 @@
 msgstr "Nepodařilo se nahrát XML schema."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19090,5 +19164,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35414,4 +35488,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35428,6 +35503,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35446,15 +35521,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "zkrácené jméno ulice"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "tag jednosměrky (oneway) na uzlu"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "tag mostu (bridge) na uzlu"
@@ -35465,12 +35540,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "špatný silniční (highway) tag na uzlu"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Nepojmenovaná neklasifikovaná silnice"
@@ -35479,16 +35554,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "silnice bez reference"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "dočasný typ silnice"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "překlep ve jménu klíče"
@@ -35498,10 +35573,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "\"cycleway\" (cyklostezka) s tagem \"bicycle\""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "\"footway\" (pěšina) s tagem \"foot\""
@@ -35510,10 +35585,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "Navíc cyklostezka jako pruh na cyklostezce"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "tag \"barrier\" (překážka) použitý na cestě"
@@ -35522,35 +35597,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "\"footway\" (pěšina) s tagem \"maxspeed\""
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "tag \"layer\" se znaménkem +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "jméno ulice obsahuje ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relace bez typu"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurace bez jména"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "neobvyklá kombinace tagů"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35655,117 +35739,127 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "MSR Maps Topo"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "MSR Maps Urban"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "český CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "český UHUL:ortofoto"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Mapy"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Mapy (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Itálie"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Itálie"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Itálie"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Francie)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA Španělsko"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonsko Basemap (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonsko Ortho (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Estonsko Multi (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Dánsko)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Dánsko)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Pangasinan (Filipíny HiRes)"
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36013,6 +36107,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Nahrávání přerušeno"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36114,9 +36208,9 @@
 msgstr "(žádné údaje o nadmořské výšce)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36134,23 +36228,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36158,26 +36282,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informace o pluginu"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36185,6 +36337,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Opravit adresy"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -36294,9 +36446,9 @@
 msgstr "Zobrazit nekompletní adresy"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "položky"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "žádné položky"
@@ -36397,17 +36549,34 @@
 msgstr "Vyberat všechny adresy s neúplnými údaji."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Vlastnosti vrstvy"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Importovat obrázek"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -37042,32 +37211,35 @@
 msgstr "Vybrat commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Plugin cadastre-fr používá z historických příčin pro grabování horkou "
-"klávesu F11\n"
-"která je aktuálně použita pro přepnutí do celoobrazovkováho režimu\n"
-"Chcete používat F11 pro grabování pluginem?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37186,8 +37358,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38090,5 +38261,5 @@
 msgstr "Přidat EGPX vrstvu"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38098,17 +38269,17 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Kreslit spojnice mezi body v této vrstvě"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Nereslit spojnice mezi body v této vrstvě"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr ""
@@ -38260,5 +38431,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38266,10 +38437,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38278,5 +38449,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38285,6 +38456,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38293,9 +38464,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38454,71 +38625,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Vytvořit"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38526,32 +38705,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38586,6 +38759,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38716,30 +38889,43 @@
 msgstr "Probíhá import…"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39437,5 +39623,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39452,5 +39638,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40190,17 +40376,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Podporované formáty obrázků"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40214,36 +40400,32 @@
 msgstr "Data ve schránce nejsou obrázek"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40865,5 +41047,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41836,4 +42018,21 @@
 msgstr "Vytvořit nový podepisovací klíč"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42057,6 +42256,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42307,6 +42506,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Otevřít editor pro vybraný zákaz odbočení"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -42881,5 +43080,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43265,4169 +43464,107 @@
 msgstr ""
 
-#~ msgid "File could not be found."
-#~ msgstr "Soubor nebyl nalezen"
-
-#~ msgid "Next Marker"
-#~ msgstr "Další značka"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Předchozí značka"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Play next marker."
-#~ msgstr "Přehraj další značku"
-
-#~ msgid "Jump forward"
-#~ msgstr "Skok vpřed"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Rychle vpřed"
-
-#~ msgid "Jump back."
-#~ msgstr "Skok zpět."
-
-#~ msgid "Play previous marker."
-#~ msgstr "Přehrát předchozí značku"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Zpomalené přehrávání"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Zadej hodnoty pro všechny konflikty"
-
-#~ msgid "No data imported."
-#~ msgstr "Nic nebylo importováno"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Tyto uzly nejsou v kruhu"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Nápověda"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otevřít v prohlížeči"
-
-#~ msgid "Create a new map."
-#~ msgstr "Vytvořit novou mapu"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznámá přípona souboru."
-
-#~ msgid "Downloading..."
-#~ msgstr "Stahuji..."
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Smazat {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Smazat {1} {0}"
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
-
-#~ msgid "Move"
-#~ msgstr "Přesunout"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Neprovádět změny"
-
-#~ msgid "false"
-#~ msgstr "nepravda"
-
-#~ msgid "true"
-#~ msgstr "pravda"
-
-#~ msgid "different"
-#~ msgstr "různé"
-
-#~ msgid "position"
-#~ msgstr "pozice"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "their version:"
-#~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
-
-#~ msgid "my version:"
-#~ msgstr "moje verze:"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neuložené změny"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Smazat označenou vrstvu."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Zatím neimplementováno."
-
-#~ msgid "Add Selected"
-#~ msgstr "Přidat vybrané"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Prosím zadejte jméno umístění"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici"
-
-#~ msgid "to"
-#~ msgstr "až"
-
-#~ msgid "y from"
-#~ msgstr "y z"
-
-#~ msgid "x from"
-#~ msgstr "x z"
-
-#~ msgid "zoom level"
-#~ msgstr "Úroveň zvětšení"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Číst GPX..."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Start GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "nynější odchylka: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Konec GPS: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "obrázek"
-#~ msgstr[1] "obrázky"
-#~ msgstr[2] "obrázky"
-
-#~ msgid "timezone difference: "
-#~ msgstr "rozdíl časových pásem: "
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchronizovat hodiny"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Data v souboru \"{0}\" nemohla být parsována."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "V souboru \"{0}\" není časová značka EXIF"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
-
-#~ msgid "Length: "
-#~ msgstr "Délka: "
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Chyba při načítání stránky {0}"
-
-#~ msgid "gps track description"
-#~ msgstr "popis gps trasy"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Zobrazit/Skrýt Text/Ikony"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Prázdná hodnota smaže klíč"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Spojit vrstvy pod označenou"
-
-#~ msgid "Create new relation"
-#~ msgstr "Vytvořit novou relaci"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nemohu se připojit na server."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Vznikly konflikty během importu"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Členové: {0}"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Nejdříve zvolte záložku"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Chyba parsování odezvy serveru"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
-
-#~ msgid "Download Area"
-#~ msgstr "Stáhnout plochu"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Žádný čas pro bod {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Obrázky pro {0}"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Zadaný čas nemůže být rozparsován"
-
-#~ msgid "name"
-#~ msgstr "jméno"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "bod"
-#~ msgstr[1] "body"
-#~ msgstr[2] "body"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} smazáno.)"
-
-#~ msgid "Set the language."
-#~ msgstr "Nastavit jazyk."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktivuji aktualizované pluginy"
+#~ msgid "unusual tag combination"
+#~ msgstr "neobvyklá kombinace tagů"
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Aktivace aktualizovaných pluginů selhala. Zkontrolujte, zda máte práva k "
-#~ "jejich přepsání."
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Namísto --download=<bbox> můžete zadat osm://<bbox>\n"
-
-#~ msgid "layer not in list."
-#~ msgstr "vrstva není v seznamu"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Kontaktuji OSM server..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Chyba při parsování"
-
-#~ msgid "File not found"
-#~ msgstr "Soubor nebyl nalezen"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Jen zajímavé směry (např. jednosměrka)"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Spojit cesty patřící do jiné relace?"
+#~ "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Nahrávání přerušeno"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Všechny cesty byli prázdné"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
+#~ msgstr ""
+#~ "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Ponechat cizí souřadnice"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Ponechat mé souřadnice"
 
 #~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Prosím vyberte přesně tři body, nebo jednu o třech bodech."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Zobraz informace o historii cest a bodů v OSM"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
+#~ msgstr ""
+#~ "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
+
+#~ msgid "Changeset"
+#~ msgstr "Sada změn"
 
 #~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Klikni pro smazání. Shift: smaže segment cesty. Alt: nemaže nepoužité "
-#~ "uzly, když mažete trasu. CTRL: smazat referenční objekty."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Zvol, posuň a otáčej objekty"
-
-#~ msgid "Boat"
-#~ msgstr "Loď"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorová loď"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cyklostezka"
-
-#~ msgid "Shop"
-#~ msgstr "Obchod"
-
-#~ msgid "Accomodation"
-#~ msgstr "Ubytování"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Prosím, zadejte hledaný řetězec"
-
-#~ msgid "Grid"
-#~ msgstr "Mřížka"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Zvolte minimálně dva uzly ke spojení"
+#~ "Upozornění: ignoruji výjimku, protože úloha byla přerušena. Výjimka: {0}"
 
 #~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Tento test kontroluje na přítomnost silnic, železnic a vodních cest, "
-#~ "které se kříží ve stejné vrstvě, ale nejsou spojeny společným uzlem."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Nemohu přejmenovat soubor \"{0}."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Otevřít globální nastaveni"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Během obnovení zálohy došlo k chybě."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Nemohu zálohovat soubor."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Během ukládání došlo k chybě."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Zadjte hledaný řetězec."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Nahrát tyto úpravy?"
-
-#~ msgid "Uploading data"
-#~ msgstr "Nahrávám data"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyřešit konflikty"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Zanechávat záložní soubory"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM heslo"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uživatelské jméno (email)"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nesprávné heslo nebo uživatelské jméno"
-
-#~ msgid "Unknown version"
-#~ msgstr "Neznámá verze"
-
-#~ msgid "Aborting..."
-#~ msgstr "Přerušuji..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Zadejte heslo"
-
-#~ msgid "Do not show again"
-#~ msgstr "Znovu nezobrazovat"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Upravit novou relaci"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Upravit relaci #{0}"
-
-#~ msgid "Rugby"
-#~ msgstr "Ragby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Upravit ragby"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Data mají chyby. Přesto nahrát?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Opravit vybrané chyby"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Upravit pozici WMS vrstvy"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Chybějící argument pro \"NEBO\""
-
-#~ msgid "Load Selection"
-#~ msgstr "Nahrát výběr"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakt {0}..."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Chybějící argument pro \"NOT\""
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Duplikovat uzly {0} do {1} uzlů"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Nemohu zapsat do záložek."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Nemohu přečíst záložky."
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambertova zóna (Francie)"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Není otevřený žádný dokument, není co uložit."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Nahrát všechy změny na OSM server."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Očekávám uzavírací závorku."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Jsou zde neuložené změny. Přesto smazat vrstvu?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Opravdu chcete smazat celou vrstvu?"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Přihlašovací jméno (email) k OSM účtu."
+#~ "Chybějící povinné atributy prvku ''bounds''. Nalezeno minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo "
-#~ "ukládat."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Nalezen element <nd> mimo cestu."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Chybí povinný atribut \"{0}\"."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> má nulový ref"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Neplatný objekt s id=0"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Připravuji data..."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konfliktní relace"
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdělit segment cesty"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Vyřešit {0} konfliktů v {1} objektech"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Spojení konfliktů"
+#~ "Varování: neočekávané číslo verze JOSM v souboru revizí, hodnota je "
+#~ "''{0}''"
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako "
-#~ "chybu."
+#~ "Plugin cadastre-fr používá z historických příčin pro grabování horkou "
+#~ "klávesu F11\n"
+#~ "která je aktuálně použita pro přepnutí do celoobrazovkováho režimu\n"
+#~ "Chcete používat F11 pro grabování pluginem?"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Aktualizovat bez dotazu"
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie."
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME oprava)"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Stahovat WMS dlaždice z {0}"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorovat zvolené chyby pro příště."
+#~ "<html>Alternativně můžete zadat <strong>adresu</strong> konkrétní "
+#~ "dlaždice ve formátu <i>přiblížení/x/y</i>, např. <i>15/256/223</i>. Je "
+#~ "možné použít i alternativní formáty <i>přiblížení,x,y</i> nebo "
+#~ "<i>přiblížení;x;y</i>.</html>"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Otevřít editor pro vybraný zákaz odbočení"
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
-#~ "problémy, protože jiné objekty (které nevidíte) je mohou používat."
-#~ "<br>Opravdu je chcete smazat?"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Zduplikovat zvolené cesty"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Zduplikovat cestu"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Vytvořit duplikát cesty"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt je v konfliktu:"
-#~ msgstr[1] "{0} objekty mají konflikty:"
-#~ msgstr[2] "{0} objektů má konflikty:"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Zdroje a typy dat"
+#~ "Varování: Ignoruji výjimku, protože úkol byl přerušen. Výjimka byla: {0}"
 
 #~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "Varování: Ignoruji výjimku, protože úkol je přerušen. Výjimka: {0}"
+
+#~ msgid "Change values?"
+#~ msgstr "Změnit hodnoty?"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Opravit adresy"
+
+#~ msgid "Both"
+#~ msgstr "Obojí"
+
+#~ msgid ""
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
+#~ "configurable because it is referenced by external applications talking to "
+#~ "JOSM."
 #~ msgstr ""
-#~ "Maximální délka (v metrech) pro vykreslování linií. Nastavte na '-1' pro "
-#~ "kreslení všech linií."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Adresa proxy serveru"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Nastavení proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonymní"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Používat proxy server"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Port proxy serveru"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Uživatelské jméno pro proxy"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Heslo pro proxy"
-
-#~ msgid "rugby"
-#~ msgstr "ragby"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Povolené akce"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Neplatná kombinace klíče/hodnoty"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Neotagované a nespojené uzly."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste "
-#~ "zmenšit oblast."
-
-#~ msgid "Preparing..."
-#~ msgstr "Připravuji..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Následující plugin nenalezen:{0}."
-
-#~ msgid "No plugin information found."
-#~ msgstr "Nenalezeny informace o pluginu"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Všechny nainstalované pluginy jsou aktuální."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Chyba při mazání souboru pluginu: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin již existuje"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Stáhnout chybějící pluginy"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Stáhnout následující pluginy?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Chyba čtení souboru informací o pluginu: {0}"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Nastaly problémy s následujícími pluginy:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Aktualizuj pluginy"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Plugin \"Remote Control\" naslouchá vždy na portu 8111 localhostu. Číslo "
-#~ "portu nelze změnit, protože s užitím tohoto čísla počítají vnější "
-#~ "aplikace využívající tento plugin."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Nemohu stáhnout plugin: {0} z {1}"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Plugin umožňující ovládání JOSM z jiných aplikací."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Nastavení pro plugin \"Remote Control\""
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Nastavení pluginu WMS Plugin"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Nápověda pluginu WMS Plugin"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Vodní objekty"
-
-#~ msgid "Uploading..."
-#~ msgstr "Nahrávám..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Upravit vlastnosti"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Povolit vestavěné výchozí hodnoty"
-
-#~ msgid "Download List"
-#~ msgstr "Stáhnout seznam"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Byly aktualizovány následující pluginy:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Verze {1}{2}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} plugin úspěšně aktualizován. Prosím, restartujte JOSM."
-#~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM."
-#~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM."
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Odstraněno \"{0}\" pro {1} ''{2}''"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Odstraněno \"{0}\" pro {1} {2}"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stupně minuty sekundy"
-
-#~ msgid "S"
-#~ msgstr "J"
-
-#~ msgid "N"
-#~ msgstr "S"
-
-#~ msgid "W"
-#~ msgstr "Z"
-
-#~ msgid "E"
-#~ msgstr "V"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA import selhal!"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Výběr se musí skládat pouze z cest"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vybrán pouze jeden uzel"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Použijte desetinné stupně."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Zadejte souřadnice nového uzlu."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli."
-
-#~ msgid "Update position for: "
-#~ msgstr "Aktualizovat pozici pro: "
-
-#~ msgid "All images"
-#~ msgstr "Všechny obrázky"
-
-#~ msgid "help"
-#~ msgstr "nápověda"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Některé z uzlů jsou (skoro) v přímce"
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Nulové souřadnice: "
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána."
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, pravděpodobně chybí některé tagy."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Nalezen <member> tag mimo relaci."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Nemohu číst z URL:\"{0}\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Chyba parsování v URL:\"{0}\""
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Plugin {0} se zdá být poškozen nebo jej není možné automaticky stáhnout."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projekce \"{0}\" je navržena pouze\n"
-#~ "pro zeměpisné šířky mezi 46.1° a 57°.\n"
-#~ "Použijte jiný projekční systém, pokud nepoužíváte\n"
-#~ "francouzský WMS server.\n"
-#~ "Nenáhrávejte žádná data po zobrazení této hlášky!"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Nahrát do OSM..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Konfigurovat zařízení..."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému "
-#~ "vývojáře JOSM."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Upozornění - bylo vyžádáno nahrání pluginu {0}. Tento plugin už není "
-#~ "potřebný."
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Prosíme oznamte chybu na {0}"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Prosíme, připojte následující informace:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Popište (detailně) kroky, které vedly k chybě."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Cesta ''{0}'' s méně, než dvěmi body."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Styl pro vnější cestu ''{0}'' nesedí."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Chyba: {0}"
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Vnitřní cesta ''{0}'' je venku."
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Chyby v kontrolním součtu: "
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Varování: {0}"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Povoleny pouze dva uzly"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Nelze otevřít adresář s nastavením: {0}"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Nelze vytvořit novou chybu. Výsledek: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Opravdu označit tento problém jako \"hotový\"?"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Obrázky bez exif pozice"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr "<html>Mohu vyfotit můj GPS přijímač.<br>Může to pomoci?</html>"
-
-#~ msgid "Grid layout"
-#~ msgstr "Rozvržení mřížky"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Otevřít stránku uživatele v prohlížeči"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Vybrat data uživatele"
-
-#~ msgid "Open User Page"
-#~ msgstr "Otevřít stránku uživatele"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Sorry, nefunguje s anonymními uživateli."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k "
-#~ "internetu."
-
-#~ msgid "Commit comment"
-#~ msgstr "Poslat komentář"
-
-#~ msgid "Error during parse."
-#~ msgstr "Chyba během parsování"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Žádný z uzlů v této cestě není připojen na něco jiného."
-
-#~ msgid "History of Element"
-#~ msgstr "Historie prvku"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' v jakémkoliv klíči nebo jménu."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' kdekoliv ve jménu."
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - objekt s daným počtem uzlů"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - neobsahuje 'Bak' ve jménu."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objekt s daným ID"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Použijte <b>\"</b> jako uvozovky (například pokud klíč obsahuje dvojtečku)"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly."
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n"
-#~ "Smazat z relace?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Výběr \"{0}\" je používán v relaci \"{1}\".\n"
-#~ "Smazat z relace?"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Nalezeno více cílových \"to\" cest."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Styl pro omezení {0} nenalezen."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Nenazezena příchozí cesta \"from\"."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Nenalezena odchozí cesta \"to\"."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Neznámá role ''{0}''."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Nalezena více než jedna \"from\" cesta."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
-
-#~ msgid "Timespan: "
-#~ msgstr "Časové rozpětí: "
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Vrstvy: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikty: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Zásobník příkazů: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autoři: {0}"
-
-#~ msgid "osmarender options"
-#~ msgstr "nastavení osmarenderu"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importovat TCX soubor jako GPS trasu"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importovat TCX soubor..."
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Zadejte jméno v menu a WMS URL"
-
-#~ msgid "Copy Default"
-#~ msgstr "Zkopírovat výchozí"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (výchozí)"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Vyberte řádek ke zkopírování."
-
-#~ 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] "Výběr obsahuje {0} cestu. Opravdu ji chcete zjednodušit?"
-#~ msgstr[1] "Výběr obsahuje {0} cesty. Opravdu je chcete všechny zjednodušit?"
-#~ msgstr[2] "Výběr obsahuje {0} cest. Opravdu je chcete všechny zjednodušit?"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Nahrána GPX trasa"
-
-#~ msgid "Painting problem"
-#~ msgstr "Problém s vykreslováním"
-
-#~ msgid "standard"
-#~ msgstr "standardní"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Padací most"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Ne-cesta ''{0}'' v multipolygonu."
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Nastaveno {0}={1} pro {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Nastaveno {0}={1} pro {2} {3}"
-
-#~ msgid "zoom"
-#~ msgstr "Zvětšení"
-
-#~ msgid "near"
-#~ msgstr "poblíž"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nemohu načíst výsledky hledání ze serveru"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Uložit a ukončit"
-
-#~ msgid "Occupied By"
-#~ msgstr "Obsazeno"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tagy (prázdná hodnota vymaže tag)"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Odebere všechny označené objekty z relace"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Odebrat označené"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Obnovit výběr"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Aktuální mapa"
-
-#~ msgid "Amenities"
-#~ msgstr "Občanská vybavenost"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Smazat vrstvu"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchronizace času s GPS přijímačem"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Odstraněn prvek ''{0}'' z relace."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Neznámý typ prvku pro ''{0}''."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Prázdný prvek v relaci."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Odstranit prvek relace"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Spojit uzly s různými členství v relaci?"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Přidat všechny zvolené objekty mezi prvky"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Přidat novou vrstvu"
-
-#~ msgid "Zone"
-#~ msgstr "Zóna"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambertova zóna"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou "
-#~ "{1}"
-
-#~ 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 ""
-#~ "Zvolené cesty mají uzly mimo hranice stažené oblasti.\n"
-#~ "Toto může vést k nechtěnému smazání používaných uzlů.\n"
-#~ "Opravdu chcete pokračovat?"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Nenalezen průsečík. Nic nebylo změněno."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Přesto pokračovat"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit."
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před "
-#~ "nahráním na server."
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Neotagované obrázky"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Jsem v časovém pásmu: "
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Veřejné"
-
-#~ msgid "No password provided."
-#~ msgstr "Není zadáno heslo."
-
-#~ msgid "Please select some data"
-#~ msgstr "Vyberte nějaká data"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Zobrazit panel autorů"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Vyberte uživatele v panelu autorů"
-
-#~ msgid "No username provided."
-#~ msgstr "Není zadáno uživatelské jméno."
-
-#~ msgid "Grid origin location"
-#~ msgstr "Pozice počátku mřížky"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Upravit pozici zvolené WMS vrstvy"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Nastala výjimka"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Otočení mřížky"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Max. výška (metrů)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Max. šířka (metrů)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Max. délka (metrů)"
-
-#~ msgid "Station"
-#~ msgstr "Stanice"
-
-#~ msgid "Edit Station"
-#~ msgstr "Upravit stanici"
-
-#~ msgid "football"
-#~ msgstr "fotbal"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motorové sporty"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Upravit motorové sporty"
-
-#~ msgid "intermedia"
-#~ msgstr "střední"
-
-#~ msgid "advance"
-#~ msgstr "pro pokročilé"
-
-#~ msgid "Edit Football"
-#~ msgstr "Upravit fotbal"
-
-#~ msgid "Football"
-#~ msgstr "Fotbal"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Upravit obchod s nápoji"
-
-#~ msgid "optician"
-#~ msgstr "Optika"
-
-#~ msgid "sports"
-#~ msgstr "Sportovní potřeby"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Otevírám sadu změn..."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Nápověda: některé změny vznikly nahráním nových dat na server."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server nepodporuje sady změn"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Neplatné id uzlu"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Skupina přednastavení ''{0}''"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} se skládá z {1} trasy"
-#~ msgstr[1] "{0} se skládá z {1} tras"
-#~ msgstr[2] "{0} se skládá z {1} tras"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Zdroje přednastavení tagů"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Zdroj přednastavených tagů"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam."
-
-#~ msgid "Delete and Download"
-#~ msgstr "Smazat a stáhnout"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Cesta se stylem plochy není uzavřená."
-
-#~ msgid "Download Plugins"
-#~ msgstr "Stáhnout pluginy"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Vyřešit konflikty"
-
-#~ msgid "autozoom"
-#~ msgstr "automatické přiblížení"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Automatické přiblížení: "
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Přesto sloučit"
-
-#~ msgid "change the viewport"
-#~ msgstr "změna pohledu"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "potvrzovat ručně všechny akce Dálkového ovládání"
-
-#~ msgid "load data from API"
-#~ msgstr "nahrání dat z API"
-
-#~ msgid "change the selection"
-#~ msgstr "změna výběru"
-
-#~ msgid "requested: {0}"
-#~ msgstr "požadováno: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "chyba při poždavku na aktualizaci"
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Automaticky stahovat dlaždice: "
-
-#~ msgid "error loading metadata"
-#~ msgstr "chyba při nahrávání metadat"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Zdroj dlaždic"
-
-#~ msgid "autoload tiles"
-#~ msgstr "automaticky stahovat dlaždice"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Nastavení pro plugin SlippyMap."
-
-#~ msgid "image not loaded"
-#~ msgstr "obrázek nebyl nahrán"
-
-#~ msgid "Request Update"
-#~ msgstr "Vyžádat aktualizaci"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Zobrazit stav dlaždice"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Stáhnout obrázek z WMS francouzského katastru"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Cache soubor pro Lambertovu zónu 4 (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Cache soubor pro Lambertovu zónu 1 (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Cache soubor pro Lambertovu zónu 3 (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Cache soubor pro Lambertovu zónu 2 (.2)"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Vyskytla se neošetřená výjimka.\n"
-#~ "\n"
-#~ "Chyba je v kódu programu. Pokud provozujete nejnovější\n"
-#~ "verzi JOSM, buďte tak laskavi a chybu nahlašte."
-
-#~ msgid "Login"
-#~ msgstr "Přihlásit se"
-
-#~ msgid "Move Down"
-#~ msgstr "Posunout dolů"
-
-#~ msgid "Move Up"
-#~ msgstr "Posunout nahoru"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor relací: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Vyřešit konfklikt"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s "
-#~ "nastavením.<br>Heslo je na server posíláno nezašifrované, zakódované v "
-#~ "URL.<br><b>Nepoužívejte stejné heslo, které používáte někde jinde.</b></"
-#~ "html>"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Obarvovat body a části trasy podle nepřesnosti polohy (HDOP). Vaše "
-#~ "zařízení musí tuto informaci ukládat."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Nenalezen \"via\" uzel nebo cesta."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Nalezen více než jeden \"via\"."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Přesto zkombinovat"
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na "
-#~ "server mají historii."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)"
-
-#~ msgid "Update Data"
-#~ msgstr "Aktualizovat data"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Nejprve změňte projekci na {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Neplatná projekce"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Díky za pochopení</p>"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Informace o pluginech staženy z {0} sitě"
-#~ msgstr[1] "Informace o pluginech staženy z {0} sití"
-#~ msgstr[2] "Informace o pluginech staženy z {0} sití"
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL serveru"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Poškozené věty: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Neznámé věty: "
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Fotografie neobsahují informace o čase"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Zvolené fotografie neobsahují informace o čase."
-
-#~ msgid "Default Values"
-#~ msgstr "Výchozí hodnoty"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Časový rozdíl {0} dnů)"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s"
-
-#~ msgid "Fade background: "
-#~ msgstr "Ztlumit pozadí: "
-
-#~ msgid "start"
-#~ msgstr "start"
-
-#~ msgid "end"
-#~ msgstr "konec"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Upravit padací most"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Upravit zkratky"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Následující chyby nastaly při hromadném stahování:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Chyby při stahování"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametry jsou načínány v pořadí, jak jsou zadány, tedy před použitím --"
-#~ "selection nejprve nahrajte nějaká data."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Základní URL OSM serveru (REST API)"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Město {0} nenalezeno, nebo není dostupné ve WMS.\n"
-#~ "Prosíme, ověřte jeho dostupnost na www.cadastre.gouv.fr"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Pro použití katastrálního WMS pluginu, změňte projekci na Lambertovu a "
-#~ "restartujte JOSM"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Vyberte jednu uzavřenou cestu z alespoň čtyř uzlů"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Upravit vozovou cestu stupně 2"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Upravit vozovou cestu stupně 4"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Upravit vozovou cestu stupně 3"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "trasa s {0} bodem"
-#~ msgstr[1] "trasy s {0} body"
-#~ msgstr[2] "trasy s {0} body"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Upravit vozovou cestu stupně 5 (nejhorší)"
-
-#~ msgid "park_and_ride"
-#~ msgstr "park and ride"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Upravit letiště"
-
-#~ msgid "Map Type"
-#~ msgstr "Typ mapy"
-
-#~ msgid "citymap"
-#~ msgstr "plán města"
-
-#~ msgid "hikingmap"
-#~ msgstr "turistická mapa"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "bicyclemap"
-#~ msgstr "cyklistická mapa"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
-#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
-#~ "vrstvu?"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Táhni segmentem cesty a vytvoř obdelník."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Pužíváte EPSG:4326 projekci, což může vást<br>k nechtěným výsledkům "
-#~ "při pravoúhlém zarovnávání.<br>Změňte vaši projekci pro zrušení tohoto "
-#~ "varování.<br>Chcete pokračovat?"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- běžící verze je {0}"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Editovat turistické informační centrum"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Plugin Duplikovat_cestu"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Editovat náročnou horskou stezku"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Editovat turistickou stezka"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "horská turistická stezka"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Editovat horskou stezka"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Náročná horská stezka"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Náročná vysokohorská stezka"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Editovat náročnou vysokohorskou stezku"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Vysokohorská stezka"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Editovat vysokohorskou stezku"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Upravit obtížnou vysokohorskou stezku"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Obtížná vysokohorská stezka"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Příslušnost k relaci byla zkopírována na všechny nově vzniklé cesty.\n"
-#~ "Mělo by být zkontrolováno, zda je výsledek korektní, a případné chyby by "
-#~ "měly být opraveny."
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Objekty se přemísťují přetažením; Shift pro přidání do výběru (Ctrl pro "
-#~ "přidání/odebrání); Shift-Ctrl pro otáčení výběrem"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Přepnout zobrazení na celou obrazovku"
-
-#~ msgid "Full Screen"
-#~ msgstr "Celá obrazovka"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé "
-#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki."
-
-#~ msgid "Board Type"
-#~ msgstr "Typ nástěnky"
-
-#~ msgid "board"
-#~ msgstr "obecná nástěnka"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Rozcestník (pěší)"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Počet drátů tvořících vodič"
-
-#~ msgid "Goods"
-#~ msgstr "Zásobování"
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Nástroje pro správu autorů/uživatelů. Vybere mapová data, která patří "
-#~ "určitmu uživateli, otevře prohlížeč se stránkou vybraného autora."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Několik nástrojů pro jednodužší život: např. zjednodušení cest, spojení "
-#~ "ploch, skok na pozici."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Otevře soubory TCX přímo v JOSM."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Validátor OSM dat. Kontroluje problémy s daty, u některých běžných "
-#~ "problémů provádí opravy. Zahrnuje kontrolu překlepů pro tagy."
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Zobrazí georeferencované obrázky na pozadí JOSM (servery WMS, Yahoo, ...)."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
-#~ "plugin může být použit pro přípravu tras pro uploud do OSM."
-
-#~ msgid "Add grid"
-#~ msgstr "Přidat mřížku"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr ""
-#~ "Duplikovat klávesovou zkratku pro tlačítko '{0}' - tlačítko bude "
-#~ "ignorováno"
-
-#~ msgid "Optional"
-#~ msgstr "Volitelné"
-
-#~ msgid "Fix relations"
-#~ msgstr "Opravit relace."
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Pamatujte, že klávesové zkratky jsou přiřazeny k akcím při startu "
-#~ "JOSM. Je tedy nutné JOSM <b>restartovat</b>, aby se změny projevily</p>"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Počet dní, po kterých se zobrazí varování<br>můžete změnit pomocí "
-#~ "'pluginmanager.warntime'.)"
-
-#~ msgid "Not initialized"
-#~ msgstr "Není inicializováno"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Archiv pluginů je již přítomen. Přejete si stáhnout současnou verzi a "
-#~ "odstranit existující archiv?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Neznámá verze: {0}"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Zobrazit geotagované fotografie"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "Bylo nalezeno {0} fotografií s GPS tagem."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Jeden z vybraných souborů je prázdný!"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Otevřít obrázky s AgPifoJ..."
-
-#~ msgid "Open an other photo"
-#~ msgstr "Otevřít další fotografie"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy."
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Chyba nastala při pokusu o dosazení fotografií do GPX trasy. Můžete ručně "
-#~ "upravit posuvníky aby byli fotografie dosazeny."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Nalezeno {0} shod s {1} v GPX trase {2}"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Máte neuložené změny. Zahodit změny a pokračovat?"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Druh kartografické projekce nebyl nalezen v souboru s nastavením. "
-#~ "Používám projekci Merkatorovu."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Kartografická projekce \"{0}\" je použitelná pouze pro\n"
-#~ "zeměpisné šířky mezi 45.7° a 47.9°\n"
-#~ "a zeměpisné délky mezi 5.7° a 10.6°.\n"
-#~ "Použijte jinou projekci v JOSM, pokud nepracujete\n"
-#~ "přímo na území Švýcarska nebo Lichtenštejnska.\n"
-#~ "Od této zprávy neposílejte na server žádná data."
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "UPOZORNĚNÍ: data umístěna příliš daleko \n"
-#~ "od současných hranic zóny Lambertovy kartografické projekce.\n"
-#~ "Neposílejte na server žádná data od této hlášky.\n"
-#~ "Vraťte zpět poslední akci, uložte svou práci\n"
-#~ "a vytvořte novou vrstvu v JOSM s novou zónou Lambertovy \n"
-#~ "kartografické projekce.."
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Obrázek s umístěný v {0} neexistuje nebo není čitelný."
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Ne, zruš operaci"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizace selhala"
-
-#~ msgid "Selection too big"
-#~ msgstr "Výběr je příliš velký"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Detekován konflikt"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Chyba při komunikaci se serverem."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Projekce nemohla být načtena z nastavení. Používám Mercatorovu projekci."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
-
-#~ msgid "Update Selection"
-#~ msgstr "Aktualizovat výběr"
-
-#~ msgid "Uploading"
-#~ msgstr "Nahrávám"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synchronizovat pouze {0} {1}"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Nahrándí do OSM API selhalo"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Selhalo navázání komunikace s OSM serverem {0}.\n"
-#~ "Zkontrolujte URL serveru v nastavení a vaše připojení k internetu."
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Následující chbya nastala během hromadného stahování:"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> "
-#~ "anebo <A HREF=\"{1}\">ve vašem jazyce</A>."
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Chybný počet parametrů pro operátor nodes."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah "
-#~ "čísel, například nodes:10-20."
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Selhala inicializace API, prosím zkuste to znovu později."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Selhala inicializace API"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na "
-#~ "stránku s historií pro OSM element pravděpodobně skončí chybou. Základní "
-#~ "URL API je: \"{0}\""
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "UPOZORNĚNÍ: Otevírám okno prohlížeče pouze pro první {0} z {1} vybraných "
-#~ "primitiv."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Počet změn překračuje maximální počet změn. Počet změn je {0} a maximum "
-#~ "je {1}"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu "
-#~ "{1}"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Délka hodnoty tagu \"{0}\" na primitivu {1} překračuje povolenou délku "
-#~ "{2}. Délka hodnoty je {3}."
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "V aktuální datové sadě nemohu nalézt primitiva s id {0}"
-
-#~ msgid "No data"
-#~ msgstr "Žádná data"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Nepodařilo se aktualizovat vybraná primitiva,"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Přesunul jste více než {0} prvků. Přesun velkého množství prvků je často "
-#~ "chybou.\n"
-#~ "Opravdu je chcete přesunout?"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Změnit {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Přidat {0} {1}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Vyřešte konflikt verzí mezi {0} {1}"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Upravit seznam WMS serverů zobrazený v menu WMS pluginu"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Členství v relacích bylo zkopírováno na všechny nové cesty.\n"
-#~ "Měl by jste výsledek zkontrolovat a  pokud je třeba opravit."
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Vrstva {0} musí být v seznamu vrstev"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Nejsou vybrány žádné prvky pro aktualizaci."
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Aktualizovat právě vybrané prvky ze serveru"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Chybějící prvek"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Aktualizuji prvky"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Smazané nebo přesunuté prvky"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Prvek byl již smazán"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Varování: Odstraňuji cestu {0} protože počet bodů klesl pod 2. Aktuálně "
-#~ "je {1}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "odstraňování reference z cesty {0}"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Odstraňuji 1 prvek"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Otočit {0} {1}"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "požadován parametr {0} > 0. Zadáno {1}."
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Obnovit {0} prvků"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Odstranit člena relace {0} {1}"
-
-#~ msgid "changeset"
-#~ msgstr "sada změn"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "nenalezena starší verze. Historie je prázdná."
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "V této datové sadě nelze nalézt prvek s id {0} a verzí {1}"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "nenalezena novější verze. Historie je prázdná."
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "V této datové sadě nelze nalézt prvek s id {0}"
-
-#~ msgid "changesets"
-#~ msgstr "sady změn"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "položka {0} nenalezena v seznamu"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Kopírovat cizí vybrané elementy před vybraný element ze seznamu "
-#~ "slučovaných elementů"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Posunout vybrané elementy o jednu pozici nahoru"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Kopírovat mé vybrané elementy za vybraný element ze seznamu slučovaných "
-#~ "elementů"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Posunout vybrané elementy o jednu pozici dolu"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Kliněte <strong>{0}</strong> pro dokončení slučování mých a cizích "
-#~ "položek</html>"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Odblokovat aktuání seznam slučovaných elementů"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Kliněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
-#~ "položek</html>"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Blokovat aktuání seznam slučovaných elementů"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parametr '{0}' nesmí být null (prázdný)"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ano, obnovit je také"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Je zde dalších {0} bodů použitých v cestě {1}<br>které byly smazány "
-#~ "na serveru.<br><br>Chcete obnovit také tyto body?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Obnovit další body?"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Komunikace se serverem selhala"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "neviditelný (na serveru)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "viditelný (na serveru)"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Fyzicky odstranit z lokální datové sady"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Ponechat klon lokální verze"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Odstranit z datové sady"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Aplikovat částečná řešení"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Zobrazit historii vybraného prvku"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Nahrávám historii pro {0} s id {1}"
-
-#~ msgid "History item"
-#~ msgstr "Položka historie"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikty v datech"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Seřadit vybrané členy relace nebo celý seznam"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Historie pro {0} {1}"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "Uživatelské jméno (e-mail)"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Pridat do seznamu nový XML zdroj."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
-
-#~ msgid "Icon paths"
-#~ msgstr "Cesty k ikonám"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru."
-#~ "<br>Heslo je jako text přenášeno na server a je součástí URL."
-#~ "<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Podporuje protokol verzí 0.5 a 0.6, přičemž server hlásí podporu od {0} "
-#~ "do {1}."
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Server odpověděl chybou s kódem {0}"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu long , zadáno ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu OsmPrimitiveType, "
-#~ "zadáno ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu boolean, zadáno ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "povinný atribut ''{0}'' chybí"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu long (>=0), zadáno "
-#~ "''{1}''"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Chybí atribut \"version\" v OSM prvku s id {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Neplatná hodnota atributu \"version\" v OSM prvku s  id {0}, zadáno {1}"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Chybí atribut \"type\" člena {0} relace {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Nepodařilo se navázat spojení s API {0}"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
-
-#~ msgid "More details"
-#~ msgstr "Více detailů"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin byl úspěšně stažen. Prosím restartujte JOSM."
-#~ msgstr[1] "{0} Pluginy byly úspěšně staženy. Prosím restartujte JOSM."
-#~ msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte JOSM."
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "Import TangoGPS selhal!"
-
-#~ msgid "World"
-#~ msgstr "Svět"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>Plugin openstreetbus používá starý server na appspot.com.<br>Nový "
-#~ "server je dostupný na schokokeks.org.<br>Chcete změnit nastavení serveru "
-#~ "na nový? (Velice doporučujeme)</html>"
-
-#~ msgid "image "
-#~ msgstr "obrázek "
-
-#~ msgid "Closed Way"
-#~ msgstr "Uzavřená cesta"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Přidávat upravovat a mazat položky WMS pluginu můžete na záložce "
-#~ "nastavení - položky se následně zobrazí v menu WMS.\n"
-#~ "\n"
-#~ "Totéž můžete také udělat v pokročilých volbách za použití následujícího "
-#~ "schema:\n"
-#~ "wmsplugin.url.1.name=Landsat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE Maps... atd\n"
-#~ "\n"
-#~ "Příklad kompletního URL WMS (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , "
-#~ "potřebujete zadat pouze odpovídající 'id'.\n"
-#~ "Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL "
-#~ "jako v příkladu a 73 nahraďte id vašeho obrázku:\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"
-#~ "Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně "
-#~ "šiřitelný), pokud si nejste jisti, nepoužívejte jej."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simuluje kliknutí pokud uděláte malý a krátký pohyb. Užitečné pro "
-#~ "tablety, pokud máte problémy, stačí kliknout na tablet bez pohybu myší "
-#~ "(obecný Java - tablet problém)."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Zobrazuje slippy map mřížku v JOSM. Můžete nahrát dlaždice ze slippy map "
-#~ "jako pozadí a požadovat aktualizace."
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Aktualizace <strong>selhala</strong>, protože prvek který "
-#~ "mažete<br>je již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Ve vaší lokální datové sadě je {0} prvků, které<br>mohou být na "
-#~ "serveru smazány. Pokud se pokusíte pozdějí o jejich smazání "
-#~ "nebo<br>aktualizaci, server bude pravděpodobně reportovat<br>konflikt."
-#~ "<br><br>Klikněte <strong>{1}</strong> pro zjištění stavu těchto "
-#~ "prvků<br>na serveru.<br>Klikněte <strong>{2}</strong> pro ignorování."
-#~ "<br></html>"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Obnovit závislé prvky?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Je zde dalších {0} prvků na něž odkazuje relace {1}<br>a jsou "
-#~ "smazány na serveru.<br><br>Chcete je obnovit také?</html>"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "neočekávaný index sloupce. Zadáno {0}"
-
-#~ msgid "Visible State:"
-#~ msgstr "Stav viditelné:"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Ponechat cizí stav viditelné"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Resetovat id na 0"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ano, vyčistit to"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Ponechat můj stav viditelné"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ano, resetovat id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Pro ponechání vaší lokální verze, JOSM<br>resetuje id {0} {1} na 0."
-#~ "<br>Při přístí aktualizaci na server bude přidělěno<br>nové id."
-#~ "<br>Souhlasíte s tím?</html>"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM odstraní lokální prvek s id {0}<br>z datové sady."
-#~ "<br>Souhlasíte?</html>"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Nerozhodnutý konflikt stavu viditelné"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "nelze aplikovat nerozhodnutou položku slučování tagů"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun mapy:"
-#~ "</b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. "
-#~ "<b>Výběr:</b> Klik."
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Nedokončil jste řešení všech konfliktů.<br>Kliněte <strong>{0}</"
-#~ "strong> pro aplikování již vyřešených konfliktů.<br>Zbývající konflikty "
-#~ "můžete vyřešit později.<br>Klikněte <strong>{1}</strong> pro návrat k "
-#~ "řešení konfliktů.</html>"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Verze <strong>{0}</strong> vytvořená na <strong>{1}</strong> "
-#~ "uživatelem <strong>{2}</strong></html>"
-
-#~ msgid "Used style"
-#~ msgstr "Použitý styl"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Chybí atribut \"ref\" člena relace {0}"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "V OSM datech chybí číslo verze"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Vrstva mřížky:"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Spojit plochy: Vymazat krátké cesty"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Spojena plocha překrývající sama sebe"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parametr ''{0}'' nesmí být null"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Sloučit vybrané prvky do jiné vrstvy"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr "<html>Nemohu přečíst soubor ''{0}''. Chyba je: <br>{1}</html>"
-
-#~ msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-#~ msgstr "<html>Při ukládání došlo k chybě.<br>Chyba: <br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Došlo k chybě při obnovování zálohy souboru.<br>Chyba: <br>{0}</"
-#~ "html>"
-
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr "Došlo k chybě při ukládání. Chyba: {0}"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Neznámá přípona souboru ''{0}''"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého "
-#~ "prvku samostatně"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "Nahrát všechny změny v jednom požadavku"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "Během hromadného stahování došlo k následujícím chybám:{0}"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Varování: vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku "
-#~ "''{1}''"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>Nelze načíst záložky.<br>{0}</html>"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Záložku nelze uložit.<br>{0}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Opravdu chcete smazat vrstvu ''{0}''?"
-
-#~ msgid "Delete all"
-#~ msgstr "Smazat vše"
-
-#~ msgid "Confirmation"
-#~ msgstr "Potvrzení"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Mazání vrstvy {0} z {1}"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Potomek relace<br>{0}<br>byl smazán na serveru. Nemůže být stažen"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Více členů odkazuje na stejný prvek"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Přidat všechny vybrané prvky z aktuální datové sady před prvního "
-#~ "vybraného člena"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Přidat všechny vybrané prvky z aktuální datové sady za posledního "
-#~ "vybraného člena"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Stáhnout prvky odkazující na jeden z vybraných prvků"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikty během stahování"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>DNS "
-#~ "jméno ''{1}'' nelze přeložit. <br>Prosím prověřte URL API ve vaší "
-#~ "konfiguraci a vaše internetové připojení.</html>"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Značky({0} konfliktů)"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "Zbývá {0} konfliktů značek k vyřešení"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>V této relaci je minimálně jeden prvek odkazující<br>na právě tuto "
-#~ "relaci.<br>To vyváří cyklické závislosti a není to doporučeno.<br>Co "
-#~ "chcete provést s touto cyklickou závislostí?</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Relace již obsahuje minimálně jeden prvek odkazující na<br>prvek "
-#~ "''{0}''<br><br>Opravdu chcete přidat dalšího člena relace?</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Vybrat prvky pro vybrané členy relace"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Smazat vybrané značky"
-
-#~ msgid "No, don't apply"
-#~ msgstr "Ne, neaplikovat"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr "Zvětšit na prvek odkazovaný prvním členem výběru"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Nastavil jste prázdnou roli pro {0} prvků.<br>To je totéž jako "
-#~ "smazání role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: "
-
-#~ msgid "<multiple>"
-#~ msgstr "<mnohonásobný>"
-
-#~ msgid "Linked"
-#~ msgstr "Spojený"
-
-#~ msgid "Could not export \"{0}\""
-#~ msgstr "Nemohu exportovat \"{0}\""
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Není k dizpozici sada změn pro rozdílový upload"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Server odpověděl chybovým kódem 404, opakování s individuálním požadavkem "
-#~ "pro každý prvek"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - obrázky s geoznačkami"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Nahradí výběr uživatelskými daty"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti "
-#~ "je: ''{0}''."
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "nemohu vyřešit nerozhodnutý konflikt"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Zóna {0}"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "V historii není žádná verze platná k datu ''{0}''"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "V historii není žádný prvek s verzí {0}"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší "
-#~ "verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám "
-#~ "můj prvek. "
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} upravený objekt:"
-#~ msgstr[1] "{0} upravené objekty:"
-#~ msgstr[2] "{0} upravených objektů:"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr "Použít existující sadu změn {0} a zavřít ji po nahrání"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr "Vloží data do již existující sady změn {0} a následně ji uzavře"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "Použít existující sadu změn {0}  a ponechat ji  otevřenou"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Vloží data do již existující sady změn {0} a ponechá ji otevřenou pro "
-#~ "vkládání dalších dat"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Nelze přečíst soubor ''{0}''.<br> Chyba: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] "V {0} vrstvě jsou neuložené změny. Zahodit změny a pokračovat?"
-#~ msgstr[1] ""
-#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
-#~ msgstr[2] ""
-#~ "Ve {0} vrstvách jsou neuložené změny. Zahodit změny a pokračovat?"
-
-#~ msgid "Close current changeset"
-#~ msgstr "Uzavřít aktuální sadu změn"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Aktuálně není otevřena žádná sada změn."
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Použít novou sadu změn a ponechat ji otevřenou"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Použít novou sadu změn a uzavřít ji"
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "Nahrát do nové nebo do existující sady změn?"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Uzavřít aktuální sadu změn ..."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "na {0} objekt"
-#~ msgstr[1] "na {0} objekty"
-#~ msgstr[2] "na {0} objektů"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Vždy přesunout a tento dialog již více nezobrazovat"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Rozhodněte, které hodnoty ponechat"
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "Klíč ''{0}'' a všechny jeho hodnoty budou odstraněny"
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "parametr ''{0}'' nesmí být prázdný"
-
-#~ msgid "not yet decided"
-#~ msgstr "zatím nerozhodnoto"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "soubor tagů neobsahuje zvolenou hodnotu ''{0}''"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Vybrat objekty nahrané tímto uživatelem"
-
-#~ msgid "Layer ''{0}'' has no modifications to be saved"
-#~ msgstr "Vrstva ''{0}'' nemá změny k uložení"
-
-#~ msgid ""
-#~ "Layer ''{0}'' has modifications which should be saved to its assoicated "
-#~ "file ''{1}''."
-#~ msgstr ""
-#~ "Vrstva ''{0}'' má změny, které by měly být uloženy do souboru ''{1}''."
-
-#~ msgid "Layer ''{0}'' has no modifications to be uploaded"
-#~ msgstr "Vrstva ''{0}'' nemá změny k nahrání na server"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Uložit a smazat"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "brown"
-#~ msgstr "hnědá"
-
-#~ msgid "black"
-#~ msgstr "černá"
-
-#~ msgid "white"
-#~ msgstr "bílá"
-
-#~ msgid "blue"
-#~ msgstr "modrá"
-
-#~ msgid "red"
-#~ msgstr "červená"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Tento test kontroluje na přítomnost cest se stejnými tagy a stejnými "
-#~ "souřadnicemi uzlů."
-
-#~ msgid "Missing mandatory attribute ''{0}''"
-#~ msgstr "Chybějící povinný atribut ''{0}''"
-
-#~ msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-#~ msgstr "Chybějící povinný atribut ''{0}'' XML elementu {1}"
-
-#~ msgid "Closing changeset {0}..."
-#~ msgstr "Uzavírám sadu změn {0}..."
-
-#~ msgid "Leaving changeset {0} open..."
-#~ msgstr "Nechávám sadu změn {0} otevřenou..."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - klíč 'type' s hodnotou přesně 'route'."
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
-#~ "relace?</html>"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Vyřešení konfliktu verzí cesty {0}"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Vyřešení konfliktu verzí relace {0}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Vyřešení konfliktů v seznamu uzlů cesty {0}"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Vyřešení konfliktu verzí uzlu {0}"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "nelze přidat uzel {0} do nekompletní cesty {1}"
-
-#~ msgid "version > 0 expected. Got {0}"
-#~ msgstr "očekávána verze > 0. Nalezena {0}"
-
-#~ msgid "id > 0 expected. Got {0}"
-#~ msgstr "očekáváno id > 0. Nalezeno {0}"
-
-#~ msgid "expected id >= 0. Got {0}"
-#~ msgstr "očekáváno id >= 0. Nalezeno {0}"
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "objekt s id=0 nemůže být neviditelný"
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Konflikty při slučování uzlů - zkombinovaný uzel je ''{0}''"
-
-#~ msgid "child.getId() >0 expected. Got {1}"
-#~ msgstr "očekáváno child.getId() >0. Nalezeno {1}"
-
-#~ msgid "id > 0 expected, got {0}"
-#~ msgstr "očekáváno id > 0, nalezeno {0}"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Připravuji objekty k nahrání na server ..."
-
-#~ msgid "Copy defaults"
-#~ msgstr "Zkopírovat výchozí hodnoty"
-
-#~ msgid "Missing attribute ''type'' on member {0} in relation {1}"
-#~ msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}"
-
-#~ msgid "Found XML element <member> not as direct child of element <relation>"
-#~ msgstr ""
-#~ "Nalezen XML element <member> jinde, než jako přímý potomek elementu "
-#~ "<relation>"
-
-#~ msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-#~ msgstr "Neplatná hodnota atributu ''ref'' elementu <nd>. Nalezeno {0}"
-
-#~ msgid "Missing attribute ''ref'' on member in relation {0}"
-#~ msgstr "Chybějící atribut ''ref'' na členu v relaci {0}"
-
-#~ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-#~ msgstr "Chybějící povinný atribut ''{0}'' na <nd> v cestě {1}"
-
-#~ msgid "found XML element <nd> element not as direct child of element <way>"
-#~ msgstr ""
-#~ "Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
-
-#~ msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-#~ msgstr "Chybějící atribut ''version'' na OSM objektu s id {0}"
-
-#~ msgid "Unknown or unsupported API version. Got {0}"
-#~ msgstr "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-#~ msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "create new objects"
-#~ msgstr "vytváření nových objektů"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Kontroila, zda při kreslení mapy nebyly nalezeny chyby."
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Dosažen konec cesty"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Vyberte počáteční bod na konci cesty"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Dosažena křižovatka"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Vybrat WMS vrstvu"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Kopírovat zvolené výchozí hodnoty"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parametr ''{0}'' nesmí být null"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> "
-#~ "anebo <A HREF=\"{1}\">ve vašem jazyce</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "V této datové sadě nelze nalézt prvek s id {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
-#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Ve vrstvě ''{0}'' jsou nevyřešené konflikty.<br>Nejprve by měly být "
-#~ "konflikty vyřešeny.</html>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Nahrávání <strong>selhalo<strong> protože používaná<br>sada změn "
-#~ "{0} byla již uzavřena na {1}.<br>Prosím nahrajte znovu s novou, nebo "
-#~ "otevřenou sadou změn.</html>"
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - klíč 'type' s libovolnou hodnotou. Vyzkoušejte také "
-#~ "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "Nebyly nalezeny pro záznamy ''{0}'' při hledání ve výběru"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Prosím zadejte řetězec filtru"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametr ''{0}'' nesmí být null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti "
-#~ "je: ''{0}''."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "očekáváno id >= 0. Nalezeno {0}"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "objekt s id=0 nemůže být neviditelný"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "V historii není žádný prvek s verzí {0}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "V historii není žádná verze platná k datu ''{0}''"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "nenalezena starší verze. Historie je prázdná."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "nenalezena novější verze. Historie je prázdná."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "neočekávaný index sloupce. Zadáno {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parametr ''{0}'' nesmí být prázdný"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "soubor tagů neobsahuje zvolenou hodnotu ''{0}''"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Zobrazit historii vybraného prvku"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "očekáváno child.getId() >0. Nalezeno {1}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Nemůžu číst \"{0}\""
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Server odpověděl chybovým kódem 404, opakování s individuálním požadavkem "
-#~ "pro každý prvek"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno "
-#~ "''{1}''"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k "
-#~ "internetu."
-
-#~ msgid "Update selections"
-#~ msgstr "Aktualizovat vybrané"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Vyberte pokud chcete data stáhnout do nové vrstvy"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Očekáváno Id > 0, zadáno {0}"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "V aktuální datové sadě není prvek s id {0}"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek "
-#~ "a opakuji přenos."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Nahrát veškeré změny v aktuální datové sadě na OSM server"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Přidáno {0} objektů"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Varování: Nepodařilo se načíst konfiguraci. Nastavená cesta ''{0}'' není "
-#~ "adresářem."
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Odstraněný objekt ''{0}''"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Odstraňování odkazu z relace {0}"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Odstraněno {0} objektů"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Varovaní: Vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku "
-#~ "''{1}''."
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. "
-#~ "Výjimka: {1}"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "poznámka: Pro některé úlohy potrebuje JOSM velké množství paměti. Může "
-#~ "být třeba přidat následující\n"
-#~ "      konfigurační volby Javy aby se zvětšilo nastavení maximálního "
-#~ "možného využití ram"
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
-#~ "nastavení synchronizácie."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Aplikovat také na potomky"
-
-#~ msgid "Failed to launch the external help browser"
-#~ msgstr "Nepodařilo se spustit externí prohlížeč"
-
-#~ msgid "gray"
-#~ msgstr "šedá"
-
-#~ msgid "line"
-#~ msgstr "vedení"
-
-#~ msgid "minor_line"
-#~ msgstr "vedlejší vedení"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialog nebyl zatím vytvořen. Zavolejte nejprve createInstance()"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Očekáváno id objektu > 0. Nalezeno {0}"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Otevřít novou sadu změn"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Nahrát data do již otevřené sady změn"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Použít otevřenou sadu změn"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Nahrát všechny změny v jednom požadavku"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Aktuální sada změn je prázdná. Nelze nahrávat data na server."
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr "Neplatná číselná hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr "Chyba: nepodařilo se přidat přihlašovací udaje do připojení."
-
-#~ msgid "Set manually the Lambert zone"
-#~ msgstr "Ručně nastavit Lambertovu zónu"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Multipolygon se musí skládat pouze z uzavřených cest."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Musíte vybrat alespoň dvě cesty."
-
-#~ msgid "Help / About"
-#~ msgstr "Nápověda / O programu"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Nejsou žádné WMS vrstvy k upravování."
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Prosíme vyberte WMS vrstvu k upravení."
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Vytváření multipolygonů jedním kliknutím, mnohem snadnější, než "
-#~ "standardní cesta pomocí editoru relací."
-
-#~ msgid "Travel"
-#~ msgstr "Cestování"
-
-#~ msgid "tower"
-#~ msgstr "věž"
-
-#~ msgid "overground"
-#~ msgstr "nadzemní"
-
-#~ msgid "underwater"
-#~ msgstr "podvodní"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Nahrávám {0} objektů ..."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parametr ''{0}'' nesmí být prázdný"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Klikněte pro stažení právě vybrané oblasti"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information.You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Nápověda k tomuto tématu chybí</p><p "
-#~ "class=\"warning-body\">Nápověda k tématu <strong>{0}</strong> není "
-#~ "aktuálně dostupná. Chybí jak pro váš lokální jazyk ({1}), tak pro "
-#~ "angličtinu.<br><br>Prosím pomozte vylepšit nápovědu pro JOSM a doplňte "
-#~ "chybějící informace. Editovat můžete začít <a href=\"{2}\">obsah ve vašem "
-#~ "lokálním jazyce ({1})</a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Nezdařilo se otevřít stránku nápovědy na url {0}.<br>Toto bývá "
-#~ "nejčastěji síťový problém, prosím prověřte<br>vaší internetovou přípojku</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun mapy:"
-#~ "</b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. "
-#~ "<b>Výběr:</b> Držet pravá tlačítko myši a nakreslit rámeček."
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Neplatný komentář k nahrávání"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Zadejte komentář k nahrávání (min. 3 znaky)"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} konflikt byl <strong>vyřešen automaticky</strong> odstraněním {0} "
-#~ "objektu<br>z lokální datové sady protože byl vymazán na serveru."
-#~ msgstr[1] ""
-#~ "{0} konflikty byly <strong>vyřešeny automaticky</strong> odstraněním {0} "
-#~ "objektů<br>z lokální datové sady protože byly vymazány na serveru."
-#~ msgstr[2] ""
-#~ "{0} konfliktů bylo <strong>vyřešeno automaticky</strong> odstraněním {0} "
-#~ "objektů<br>z lokální datové sady protože byly vymazány na serveru."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} konflikt zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
-#~ "vyřešte jej manuálně."
-#~ msgstr[1] ""
-#~ "{0} konflikty zbývají k řešení.<br><br>Prosím otevřete seznam konfliktů a "
-#~ "vyřešte je manuálně."
-#~ msgstr[2] ""
-#~ "{0} konfliktů zbývá k řešení.<br><br>Prosím otevřete seznam konfliktů a "
-#~ "vyřešte je manuálně."
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Dostupné styly (z {0})"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Přidat soubor nebo URL aktivního stylu"
-
-#~ msgid "Active styles"
-#~ msgstr "Aktivní styly"
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
-#~ msgstr ""
-#~ "Aktualizoval jste aplikaci JOSM.\n"
-#~ "Aby se zamezilo potížím s pluginy je třeba je taktéž aktualizovat.\n"
-#~ "Aktualizovat pluginy nyní?"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} plugin stažen úspěšně."
-#~ msgstr[1] "{0} pluginy staženy úspěšně."
-#~ msgstr[2] "{0} pluginů staženo úspěšně."
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>Požadováno nahrání pluginu {0}.<br>Vývoj tohoto pluginu byl ukončen "
-#~ "a pravděpodobně bude působit problemy.<br>Měl by být deaktivován."
-#~ "<br>Chcete jej smazat z konfigurace?</html>"
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr "Požadováno nahrání pluginu {0}. Tento plugin není již nadále třeba."
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Prosím zadejte zeměpisnou šířku v rozsahu -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Prosím zadejte platnou zeměpisnou délku v rozsahu -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Prosím zadejte platnou zeměpisnou šířku v rozsahu -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Prosím zadejte zeměpisnou délku v rozsahu -180..180"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Chystáte se spustit {0} oken prohlížeče.<br>To může jednak zaplnit vaši "
-#~ "obrazovku mnoha okny<br>a může to též chvíli trvat."
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "Vyhledávám dostupné překlady ..."
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}"
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Prosím restartujte JOSM."
-
-#~ msgid "({0}/{1}) Uploading {2} objects..."
-#~ msgstr "({0}/{1}) Nahrávám {2} objektů..."
-
-#~ msgid "Plugin {0} is no longer necessary and has been deactivated."
-#~ msgstr "Plugin {0} již není potřeba a byl deaktivován."
-
-#~ msgid "You've encountered a bug in JOSM"
-#~ msgstr "Narazili jste na chybu v JOSM"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Umožní vytvořit různá schémata nastavení barev a přepínat mezi nimi. "
-#~ "Pouze změníte barvy a vytvoříte nové schéma. Dá se použít pro přepnutí "
-#~ "světlého stylu pro lepší viditelnost v ostrém slunci. Podívejte se na "
-#~ "dialog „Nastavení mapy“ v preferencích JOSM."
-
-#~ msgid "Footway"
-#~ msgstr "Chodník, stezka pro chodce"
-
-#~ msgid "Bridleway"
-#~ msgstr "Hypostezka, stezka pro koně"
-
-#~ msgid "Man-Made"
-#~ msgstr "Objekty a další POI"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Zavřít dialog a nevytvořit nový bod"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Celoobrazovkový režim"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Nelze otevřít adresář.<br>Prosím vyberte soubor!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Otevírám {0} souborů..."
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr ""
-#~ "Aktuální hodnota nemůže být ID sady změn. Zadejte prosím celé číslo > 0"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Základní URL<br>''{0}''<br>této WMS vrstvy neobsahuje ukončovací "
-#~ "''&'' ani ''?''.<br>To většinou vede k neplatným WMS požadavkům. Měl "
-#~ "byste prověřit svoji<br>konfiguraci.<br>Chcete stáhnout dlaždice z WMS "
-#~ "serveru znovu?"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Varování: Základní URL WMS služby ''{0}'' neobsahuje ukončovací '&' nebo "
-#~ "'?'."
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Lesní/polní cesta kvalita 3"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Lesní/polní cesta kvalita 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Lesní/polní cesta kvalita 1 (zpevněná)"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Lesní/polní cesta kvalita 5 (nejhorší)"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Lesní/polní cesta kvalita 4"
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>JOSM právě běží v anonymním režimu. Nelze stáhnout<br>vaše sady "
-#~ "změn ze serveru OSM, dokud nezadáte vaše jméno<br>v konfiguraci JOSM.</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Výběr omezí dotaz pouze na vaše sady změn.<br>Zrušení výběru zahrne "
-#~ "do dotazu všechny sady změn.</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "Varování: neočekávaný formát základní URL API. Přesměrování na informace "
-#~ "nebo historickou stránku OSM prvku pravděpodobně selže. Základní URL API "
-#~ "je: ''{0}''"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr "Pro mazání je třeba vybrat alespoň jeden objekt, nemáte nic vybráno"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Nastavit příznak 'upraveno' pro cestu {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Nastavit příznak 'upraveno' pro relaci {0}"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Nastavit příznak 'upraveno' pro bod {0}"
-
-#~ msgid "Uploading {0} objects..."
-#~ msgstr "Nahrávám {0} objektů ..."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Přepnout celoobrazovkový pohled"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Chybí pravá závorka"
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Vybraná oblast ke stažení</strong> (minšířka,mindélka, "
-#~ "maxšířka, maxdélka): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "The user name can't be empty. Please enter your OSM user name"
-#~ msgstr ""
-#~ "Uživatelské jméno nemůže být prázdné. Prosím zadejte své uživatelské "
-#~ "jméno pro OSM"
-
-#~ msgid "The password can't be empty. Please enter your OSM password"
-#~ msgstr "Heslo nemůže být prázdné. Prosím zadejte své heslo pro OSM"
-
-#~ msgid ""
-#~ "<html>You updated your JOSM software.<br>To prevent problems the plugins "
-#~ "should be updated as well.<br><br>Update plugins now?</html>"
-#~ msgstr ""
-#~ "<html>Aktualizoval jste vaši verzi JOSM.<br>Aby se předešlo potížím, je "
-#~ "vhodné aktualizovat také pluginy.<br><br>Aktualizovat pluginy teď?</html>"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relace tvoří smyčku, protože odkazují vzájemně na sebe.<br>JOSM "
-#~ "je nemůže takto odeslat na server. Prosím opravte relace a odstraněním "
-#~ "kruhové reference.</html>"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Varovaní: Vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku "
-#~ "''{1}''."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Potomek relace<br>{0}<br>byl smazán na serveru. Nemůže být stažen"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr "<html>Nemohu otevřít adresář.<br>Prosím vyberte soubor!</html>"
-
-#~ msgid "Download Object"
-#~ msgstr "Stáhnout objekt"
-
-#~ msgid "range"
-#~ msgstr "rozsah"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Nelze duplikovat neseřazené cesty."
-
-#~ msgid "Download Object..."
-#~ msgstr "Stáhnout objekt..."
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "Cesta v  OSM <span class=\"object-name\">{0}</span> s rolí <tt>{1}</tt> "
-#~ "by měla být rozdělena v bodě <span class=\"object-name\">{2}</span> kde "
-#~ "je napojena na cestu <span class=\"object-name\">{3}</span>."
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Nápověda k vybranému tématu neexistuje</"
-#~ "p><p class=\"warning-body\">Nápověda na téma  <strong>{0}</strong> není "
-#~ "dosud dostupná. Chybí jak vaše lokální jazyková verze ({1}) tak verze "
-#~ "anglická.<br><br>Prosíme pomozte vylepšit JOSM a doplňte chybějící "
-#~ "informace. Můžete upravovat <a href=\"{2}\">nápovědu ve vašem jazyce ({1})"
-#~ "</a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Stáhnout a zobrazit historii vybraných prvků"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Přiblížit na odpovídající prvky v aktuální datové vrstvě"
-
-#~ msgid "farmland"
-#~ msgstr "pole, zemědělská půda"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Francie)"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Specifikováno neplatné ID. Nelze stáhnout objekt."
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Obnovit {0} objekt"
-#~ msgstr[1] "Obnovit {0} objekty"
-#~ msgstr[2] "Obnovit {0} objektů"
-
-#~ msgid "Set width of building"
-#~ msgstr "Nastavit šířku budovy"
-
-#~ msgid "With kiosk"
-#~ msgstr "S kioskem"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM nalezl {0} neuložených datových vrstev. Vypadá to, že JOSM byl "
-#~ "neočekávaně ukončen. Chcete data obnovit?"
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Varování:</strong> Heslo bude <strong>jednou</strong> zasláno "
-#~ "jako čistý text na web OSM. <strong>Nepoužívejte</strong> hesla která "
-#~ "chcete utajit dokud nebude OSM server podporovat bezpečný (https) "
-#~ "komunikační kanál."
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Prosím zadejte své uživatelské jméno a heslo pro OSM. Heslo "
-#~ "<strong>nebude</strong> uloženo v konfiguraci JOSM jako čitelný text a "
-#~ "bude zasláno serveru OSM <strong>pouze jednou</strong>. Při dalších "
-#~ "přenosech dat již nebude používáno."
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Povolit vzdálené ovládání (je třeba mít plugin remotecontrol)"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Vypadá to, ze se při posledním spuštění JOSM zhroutil. Chcete obnovit "
-#~ "data?"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Varování: neočekávaný konflikt v nastavení"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Migrace nastavení leteckých snímků"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr ""
-#~ "Migrace nastavení leteckých snímků: konflikt při přesunu pole {0} -> {1}"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Migrace nastavení leteckých snímků: konflikt při přesunu nastavení {0} -> "
-#~ "{1}"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Konflikt v atributu 'visible' (viditelnost) pro objekt typu {0} s id {1}"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "Nelze vybrat izolovaný uzel"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Levý klik: odznačit uzel"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Levý klik: označit uzel"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "Aktuální projekce je nastavena na {0}"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Výškový profil pro trasu '"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "Zadejte nejdřív jméno souboru."
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "Soubor se skriptem ''{0}'' neexistuje."
-
-#~ msgid "Run the script"
-#~ msgstr "Spustit skript"
-
-#~ msgid "Run"
-#~ msgstr "Spustit"
-
-#~ msgid "File:"
-#~ msgstr "Soubor:"
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "Zadejte jméno souboru se skriptem"
-
-#~ msgid "Run..."
-#~ msgstr "Spustit..."
-
-#~ msgid "Run a script"
-#~ msgstr "Spustit skript"
-
-#~ msgid "Script Error"
-#~ msgstr "Chyba skriptu"
-
-#~ msgid "File not readable"
-#~ msgstr "Soubor nelze přečíst"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "Soubor se skriptem ''{0}'' nelze přečíst"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "Spuštění skriptu selhalo."
-
-#~ msgid "IO error"
-#~ msgstr "IO chyba"
-
-#~ msgid "Empty file name"
-#~ msgstr "Prázdné jméno souboru"
-
-#~ msgid "Scripting"
-#~ msgstr "Skriptování"
-
-#~ msgid "cancel"
-#~ msgstr "zrušit"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Select a script"
-#~ msgstr "Vyberte skript"
-
-#~ msgid "Configure..."
-#~ msgstr "Konfigurace..."
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "''{0}'' neexistuje."
-
-#~ msgid "JAR files"
-#~ msgstr "JAR soubory"
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "''{0}'' je adresář. Očekáván jar soubor."
-
-#~ msgid "Select a jar file"
-#~ msgstr "Vybrat jar soubor"
-
-#~ msgid "JAR file"
-#~ msgstr "JAR soubor"
-
-#~ msgid "Version:"
-#~ msgstr "Verze:"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Zjednodušení plochy (odstraněn {0} uzel)"
-#~ msgstr[1] "Zjednodušení plochy (odstraněny {0} uzly)"
-#~ msgstr[2] "Zjednodušení plochy (odstraněno {0} uzlů)"
-
-#~ msgid "MIME-Types:"
-#~ msgstr "MIME-Typy:"
-
-#~ msgid "Language:"
-#~ msgstr "Jazyk:"
-
-#~ msgid "Language version:"
-#~ msgstr "Verze jazyka:"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "GnuPG příkaz ke spuštění:"
-
-#~ msgid "Privacy"
-#~ msgstr "Soukromí"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "Neptat se znovu na klíč"
-
-#~ msgid "Internal Style"
-#~ msgstr "Interní styl"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Nastavení WMSPluginu:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Nastavení SlippyMap:"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Zmenit vlastnosti jednoho objektu"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "trasa"
-#~ msgstr[1] "trasy"
-#~ msgstr[2] "trasy"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Nepojmenovaná WMS vrstva"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Migrace nastavení WMSPlugin/SlippyMap"
-
-#~ msgid "remove entry"
-#~ msgstr "odstranit položku"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "přidat novou wms/tms položku zadáním url"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Seznam WMS vrstev:"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Ponechat aktuální nastavení"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Přepsat nastavením SlippyMap"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Přepsat nastavením WMSPluginu"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Přiblížit na objekty v obsahu této sady změn v aktuální datové vrstvě"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Nejlepší přiblížení: {0}"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Zobrazené přiblížení: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Aktuální přiblížení: {0}"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Min přiblížení: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max přiblížení: "
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Vyberte alespoň dva uzly ke spojení, nebo uzel, který je blízko dalšího "
-#~ "uzlu."
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Spustit prohlížeč s wiki nápovědou pro zvolený objekt"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Nastavujete prázdnou roli pro {0} objekt."
-#~ msgstr[1] "Nastavujete prázdnou roli pro {0} objekty."
-#~ msgstr[2] "Nastavujete prázdnou roli pro {0} objektů."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Toto odpovídá smazání rolí těchto objektů."
-
-#~ msgid "Key Signatures"
-#~ msgstr "Podpisy klíče"
-
-#~ msgid "Contour Merge"
-#~ msgstr "Sloučení obrysů"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "Sloučit obrysy plochy s obrysy jiné plochy"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Slučuji obrysy"
-
-#~ msgid "parking_lot"
-#~ msgstr "parkoviště"
-
-#~ msgid "sidewalk"
-#~ msgstr "chodník"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (mirror)"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Není možné přiřadit zadaný odkaz nebo ID k vybrané službě. Zkuste zadat "
-#~ "odkaz znovu."
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Uchopte segmet cesty pro vytvoření obdélníku. Ctrl-tažení pro pohyb "
-#~ "segmentu podle jeho normály."
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} bod"
-#~ msgstr[1] "{0} body"
-#~ msgstr[2] "{0} bodů"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Objekt typu {0} s id {1} byl označen ke smazání, ale chybí ve zdrojové "
-#~ "datové sadě"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Tento test hledá objekty s názvy ve více jazycích, jejichž atribut 'name' "
-#~ "neodpovídá jednomu z atributů 'name:*', např Bohemia-Čechy-Böhmen."
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Tato vrstva nepodporuje žádnou z projekcí JOSM,\n"
-#~ "takže ji nemůžete použít. Tato zpráva se již znovu nezobrazí."
+#~ "JOSM vždy poslouchá na adrese localhost na portu 8111. Tento port nelze "
+#~ "změnit, protože se na něj odkazují externí aplikace komunikující s JOSM."
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Nalezena podezřelá data. Opravdu je nahrát?"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 26529)
+++ applications/editors/josm/i18n/po/da.po	(revision 26530)
@@ -9,7 +9,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-20 11:29+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-08 11:59+0000\n"
+"Last-Translator: Jens Hyllegaard <jens@linushvj.dk>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@@ -18,10 +18,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:44+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:43+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -36,12 +36,12 @@
 msgstr "Hjælp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorerer misformet fil-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -96,6 +96,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -119,14 +120,14 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" accepterer ikke filnavne eller fil-URL’er"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorerer misformet URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "kompatibel) version af JOSM.</li></ul>Mere Info:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Afslut JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Fortsæt, prøv alligevel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -390,6 +391,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -416,5 +417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -422,7 +423,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -430,5 +432,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -639,5 +641,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1081,6 +1083,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1231,5 +1233,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1458,6 +1460,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2129,5 +2131,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2443,7 +2445,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Download data"
@@ -2699,7 +2701,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ignorerer undtagelse fordi download blev annulleret. Undtagelse var: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2834,10 +2835,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3003,5 +3004,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3608,6 +3609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Mistænkelig data er fundet. Upload alligevel?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3657,40 +3658,40 @@
 msgstr "Rettede punkter for {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Fjern \"{0}\" for punkt ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Fjern \"{0}\" for vej ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Fjern \"{0}\" for relation ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Sæt {0}={1} for punkt ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Sæt {0}={1} for vej ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Sæt {0}={1} for relation ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Fjern \"{0}\" for {1} objekter"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3819,4 +3820,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Bekræftelse af sletning"
@@ -4133,9 +4135,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke nulstille "
-"indstillingsfil til standard: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4171,6 +4171,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr "Advarsel: Uventet JOSM versionsnummer i revisionsfil, værdi er \"{0}\""
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4277,10 +4277,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM forventede at finde primitiv [{0} {1}] i datasættet, men den er der "
-"ikke. Rapporter venligst dette på http://josm.openstreetmap.de . Dette er "
-"ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4382,5 +4379,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4399,8 +4396,8 @@
 msgstr "multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4543,52 +4540,64 @@
 msgstr "WGS84 Geografisk"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Advarsel: Kunne ikke åbne input strøm for resource ''/data/{0}''. Kan ikke "
-"hente NTF<->RGF93 net."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} til {2} grader)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-zone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4613,80 +4622,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Nord"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Syd"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Halvkugle"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4842,5 +4871,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:334
 msgid "Nodes at same position"
-msgstr ""
+msgstr "Punkter med samme position"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
@@ -4910,45 +4939,45 @@
 msgstr "Denne test tjekker om multipolygoner er gyldige"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Ingen stil for multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Ingen \"style\" i multipolygon-relation"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygon er ikke lukket"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5224,5 +5253,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5247,5 +5276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5256,5 +5285,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5666,5 +5695,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5731,5 +5760,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "landevej"
@@ -5737,5 +5766,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5743,10 +5772,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vandvej"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "brug af jord"
@@ -5756,5 +5785,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5768,5 +5797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5779,5 +5808,5 @@
 msgstr "offentlig transport"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6140,5 +6169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6249,4 +6278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6352,5 +6382,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6393,5 +6423,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6682,9 +6712,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Liste over sammenlagte elementer. De vil erstate \"mine elementer\" når "
-"sammenlægningsbeslutningerne er udført."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6936,10 +6964,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Behold mine koordinater"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Behold deres koordinater"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6996,6 +7024,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7017,6 +7045,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7427,5 +7455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7667,5 +7695,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7879,7 +7907,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "ukendt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8144,5 +8202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8162,5 +8220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8177,5 +8235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -8183,5 +8241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Hent ufuldstændige medlemmer"
@@ -8224,5 +8282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8230,5 +8288,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8424,5 +8482,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8525,5 +8583,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Bruger"
@@ -9521,5 +9578,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9701,5 +9758,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9849,4 +9906,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Kun rettesæt ejet af mig selv"
@@ -9859,4 +9917,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Kun rettesæt ejet af brugeren med det følgende brugernavn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10139,9 +10203,9 @@
 msgstr "Denne rettesætsforespørgselsURL er ugyldig"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10150,13 +10214,13 @@
 msgstr[1] "Dette vil ændre op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "En tom værdi sletter taggen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10169,18 +10233,19 @@
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Ret værdier?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10189,5 +10254,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10197,5 +10262,5 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10204,27 +10269,31 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Vælg de objekter, du vil rette egenskaber for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Egenskaber/medlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Egenskaber for valgte objekter."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10233,62 +10302,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det markerede fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Vælg relation i hovedmarkering."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10352,10 +10421,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Advarsel: Ignorerer undtagelse fordi opgave er annuleret. Undtagelse: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10377,5 +10447,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10714,10 +10784,4 @@
 msgstr "Der var {0} konflikter under importen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Advarsel: Ignorerer undtagelse fordi opgave er annulleret. Undtagelse: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10758,10 +10822,4 @@
 msgid "Load relation"
 msgstr "Indlæs relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11043,37 +11101,4 @@
 msgstr "Type"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "ukendt"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11193,20 +11218,20 @@
 msgstr "Koordinater"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Historik for punkt {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historik for vej {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Historik for relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Hent historikken fra serveren igen"
@@ -11302,6 +11327,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Rettesæt"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11883,8 +11908,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12316,4 +12341,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12345,13 +12371,4 @@
 "<html>Kan ikke uploade {0} objekter i en anmodning fordi den<br>maksimale "
 "rettesætsstørrelse {1} på server ''{2}'' er overskredet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html><strong>Flere rettesæt</strong> er nødvendige for at kunne uploade {0} "
-"objekter. Hvilken strategi ønsker du at bruge?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12428,38 +12445,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Tilpas farve"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Standard"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Vælg en farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12470,9 +12487,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12480,26 +12497,26 @@
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Tidsrum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Længde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12508,8 +12525,8 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12518,12 +12535,12 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12532,10 +12549,10 @@
 msgstr[1] "{0} spor, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12545,78 +12562,78 @@
 "<br>Hvis du vil uploade traces, så kig her:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Download fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Download alt indenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maksimum område per anmodning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Hent nær:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "kun spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "kun punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12627,12 +12644,12 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12642,6 +12659,6 @@
 "blev udeladt eller flyttet til starten."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12651,27 +12668,27 @@
 "estimere deres tid blev udeladt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Markører fra navngivne punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne punkter fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12684,29 +12701,29 @@
 "af hvordan de hænger sammen med lyddata.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import er ikke mulig"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importér billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12813,5 +12830,5 @@
 msgstr "Følgende problemer blev fundet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12821,57 +12838,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Autozoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Hent tern automatisk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Hent tern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Vis info om tern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Hent alle tern"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Øg zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Reducér zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Ret ind til ternstørrelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Tøm tern-mellemlager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13416,10 +13441,10 @@
 msgstr "JPEG-billeder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "GPS-markør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13427,5 +13452,5 @@
 msgstr[1] "markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13434,21 +13459,21 @@
 msgstr[1] "{0} består af {1} markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Vis tekst/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Slå synlighed af markørtekst og -ikoner til/fra"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synkronisér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13457,5 +13482,5 @@
 "angivelsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13463,14 +13488,14 @@
 msgstr "Lyd synkroniseret på punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan ikke synkronisere i det afspillede lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Sæt audio-markør ved afspilnings-starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13498,13 +13523,13 @@
 msgstr "Kan ikke oprette ny lydmarkør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Der opstod en fejl i forsøget på at vise URL’en for denne markør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL var: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Fejl ved visning af URL"
@@ -14497,73 +14522,73 @@
 msgstr "Farver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspile."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Kun ved enden af vejen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Tegn ensrettet pile."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Tegn numre for segment-rækkefølgen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn grænserne for downloadet data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle punkter i valg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i anden farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Udglattet kortgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningsvisere på vejstykker"
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn ordensnumrene på alle segmenter i deres vej."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omridset af data hentet fra serveren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14571,9 +14596,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en anden farve."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14581,15 +14606,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Beskrivelse(Desc)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Ingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Brug globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14600,47 +14661,39 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Ingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Fremtving linjer, hvis ingen segmenter blev importeret."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkter."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Tegn en cirkel udfra HDOP-værdi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighed (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -14648,5 +14701,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14670,5 +14723,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14711,5 +14764,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14723,38 +14776,18 @@
 msgstr "Gående"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Opret markører ved læsning af GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig optegning (ser grimmere ud)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Beskrivelse(Desc)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Begge"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14764,10 +14797,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellem rå GPS-punkter"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14777,10 +14810,10 @@
 "for at tegne alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maksimal længde for lokale filer (meter)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14789,10 +14822,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maksimal længde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14801,10 +14834,10 @@
 "information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14812,5 +14845,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14818,14 +14851,14 @@
 msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Mindste afstand (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14834,13 +14867,13 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i laghåndtering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Farvelægger punkter og spor efter hastighed."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14850,27 +14883,45 @@
 "optage-enhed skal logge denne information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15541,5 +15592,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15633,5 +15684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Nulstil"
@@ -15911,6 +15962,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Opdater uden at spørge"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16320,5 +16371,5 @@
 msgstr "Ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16347,9 +16398,9 @@
 msgstr "Søg i fordefinerede"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16640,9 +16691,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Der opstod en fejl under fortolkning af GPX-fil {0}. Kun en del af filen vil "
-"være tilgængelig."
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16968,8 +17017,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"Indledning til OsmChange dokumentet er ikke skrevet endnu. Skriv venligst "
-"først."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17193,9 +17240,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Mangler obligatoriske attributter for element ''bounds''. Har minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17593,4 +17638,9 @@
 msgstr "Gem brugernavn og adgangskode (ukrypteret)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18422,4 +18472,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18541,4 +18593,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19117,5 +19183,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35435,4 +35501,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35449,6 +35516,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35467,15 +35534,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "forkortet gadenavn"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "Envejs-tag på et punkt"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "Bro-tag på et punkt"
@@ -35486,12 +35553,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "Forkert landevej-tag på et punkt"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Unavngivet uklassificeret vej"
@@ -35500,16 +35567,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "Landevej uden reference"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "midlertidig landevejstype"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "fejlstavet nøgle"
@@ -35519,10 +35586,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "cykelsti med tag cykel"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -35531,10 +35598,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "adskilt cykelsti som spor på en cykelsti"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "barriere brugt på en vej"
@@ -35543,35 +35610,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "maks. hastighed angivet for gangsti"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "Lag-tag med \"+\"-tegn"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "vejnavn indeholder \"ss\""
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relation uden type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurant uden navn"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "usædvanlig kombination af tags"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35676,117 +35752,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-kort"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE kort (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italien"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilen - Italien"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36035,6 +36121,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Upload annulleret"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36136,9 +36222,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36156,23 +36242,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36180,26 +36296,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Information om udvidelser"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36207,5 +36351,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36316,9 +36460,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36417,17 +36561,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -37061,28 +37222,35 @@
 msgstr "Vælg kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Autokilde"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM er stoppet for at ændring skal have effekt."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37200,9 +37368,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Erstat den oprindelige hvide baggrund med den baggrundsfarve, der er "
-"defineret i JOSM-indstillingerne."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38095,5 +38261,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38103,17 +38269,17 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter for dette lag."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkter for dette lag."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Vælg linjetegnings-indstillinger"
@@ -38265,5 +38431,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38271,10 +38437,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38283,5 +38449,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38290,6 +38456,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38298,9 +38464,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38459,71 +38625,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38531,32 +38705,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38591,6 +38759,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38721,30 +38889,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39433,5 +39614,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39448,5 +39629,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40183,17 +40364,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40207,36 +40388,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40858,5 +41035,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41828,4 +42005,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42045,6 +42239,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42291,5 +42485,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42860,5 +43054,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43255,2314 +43449,99 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Flyt"
-
-#~ msgid "No data imported."
-#~ msgstr "Intet data importeret."
-
-#~ msgid "File could not be found."
-#~ msgstr "Filen kunne ikke findes."
-
-#~ msgid "Do not show again"
-#~ msgstr "Vis ikke igen"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Send venligst en fejlrapport på {0}"
+#~ msgid "Change values?"
+#~ msgstr "Ret værdier?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "usædvanlig kombination af tags"
 
 #~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "En uventet handling opstod.\n"
-#~ "\n"
-#~ "Dette er altid en programmeringsfejl. Hvis du bruger seneste\n"
-#~ "udgave af JOSM, kan du hjælpe ved at sende en fejlrapport."
+#~ "Erstat den oprindelige hvide baggrund med den baggrundsfarve, der er "
+#~ "defineret i JOSM-indstillingerne."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Behold deres koordinater"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Behold mine koordinater"
 
 #~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM "
-#~ "fra, om problemet."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ "Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke nulstille "
+#~ "indstillingsfil til standard: {0}"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Beskriv de trin, du foretog for at få fejlen (så detaljeret som muligt)!"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Husk at nævne følgende informationer:"
+#~ "Advarsel: Uventet JOSM versionsnummer i revisionsfil, værdi er \"{0}\""
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv "
-#~ "igen om kort tid."
-
-#~ msgid "Preparing data..."
-#~ msgstr "Forbereder data..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Fejl ved fortolkning"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Fandt <nd>-element i en ikke-vej"
-
-#~ msgid "Unknown version"
-#~ msgstr "Ukendt version"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Mangler obligatorisk attribut \"{0}\"."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har nul ref"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Ugyldigt objekt med id=0"
-
-#~ msgid "Preparing..."
-#~ msgstr "Forbereder..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Uploader..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Forkert brugernavn eller kodeord"
-
-#~ msgid "Aborting..."
-#~ msgstr "Afbryder..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Indtast kodeord"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Udvidelsen blev ikke fundet: {0}"
-
-#~ msgid "to"
-#~ msgstr "til"
-
-#~ msgid "y from"
-#~ msgstr "y fra"
-
-#~ msgid "x from"
-#~ msgstr "x fra"
-
-#~ msgid "zoom level"
-#~ msgstr "Zoom-niveau"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Indtast et navn for stedet."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ "Advarsel: Kunne ikke åbne input strøm for resource ''/data/{0}''. Kan "
+#~ "ikke hente NTF<->RGF93 net."
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Datakilder og typer"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "En tom værdi vil slette nøglen."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Kontakter OSM-serveren..."
-
-#~ msgid "Edit new relation"
-#~ msgstr "Ret ny relation"
-
-#~ msgid "Create new relation"
-#~ msgstr "Opret ny relation"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Rediger egenskaber"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Ret relation #{0}"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tags (tom værdi fjerner tag)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Tilføj alle valgte objekter som medlemmer"
-
-#~ msgid "Add Selected"
-#~ msgstr "Tilføj valgte"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fejl i fortolkning af server-svar."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Der var konflikter ved import."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Medlemmer: {0}"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan ikke forbinde til serveren."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Der er ugemte ændringer. Skal laget alligevel slettes?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Vil du virkelig slette hele laget?"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Slet det valgte lag."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Endnu ikke implementeret."
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Flet laget nedenunder sammen med det valgte lag."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Vis/skjul tekst/ikoner"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Sammenfletnings-konflikter."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Udred konflikter"
-
-#~ msgid "name"
-#~ msgstr "navn"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punkt"
-#~ msgstr[1] "punkter"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "et spor med {0} punkt"
-#~ msgstr[1] "et spor med {0} punkter"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punkt"
-#~ msgstr[1] "{0} punkter"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} består af {1} spor"
-#~ msgstr[1] "{0} består af {1} spor"
-
-#~ msgid "Timespan: "
-#~ msgstr "Tidshorisont: "
-
-#~ msgid "Length: "
-#~ msgstr "Længde: "
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ingen billeder med læsbare tidsstempler fundet"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS-start: {0}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Intet tidspunkt for punkt {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Billeder for {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Indlæs GPX..."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} inden for sporet."
-
-#~ msgid "Sync clock"
-#~ msgstr "Synkronisér ur"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "billede"
-#~ msgstr[1] "billeder"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} slettet.)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Den indtastede tid kunne ikke forstås."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Login-navn (e-mail) til OSM-kontoen."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-brugernavn (e-mail)"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Behold backup-filer"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Ingen udvidelsesinformationer blev fundet."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alle installerede udvidelser er opdaterede."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Udvidelsen findes allerede"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Fejl ved indlæsning af fil med udvidelsesinformationer: {0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Version {1}{2}"
+#~ "Advarsel: Ignorerer undtagelse fordi opgave er annuleret. Undtagelse: {0}"
 
 #~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Opdatér følgende udvidelser:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxy-indstillinger"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonym"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "De punkter ligger ikke i en cirkel."
+#~ "Advarsel: Ignorerer undtagelse fordi opgave er annulleret. Undtagelse: {0}"
+
+#~ msgid "Changeset"
+#~ msgstr "Rettesæt"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Upload annulleret"
 
 #~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Vælg venligst præcis tre punkter eller en vej med præcis tre punkter."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negative værdier angiver vestlig/sydlig halvkugle."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Forrige markør"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Afspil forrige markør."
-
-#~ msgid "Play next marker."
-#~ msgstr "Afspil næste markør."
-
-#~ msgid "Next Marker"
-#~ msgstr "Næste markør"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxyserver-port"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Proxyserver-brugernavn"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Proxyserver-kodeord"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Tak for din forståelse</p>"
-
-#~ msgid "layer not in list."
-#~ msgstr "lag er ikke i listen"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Åbn fil (som rå GPS, hvis .gpx)"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktiverer opdaterede udvidelser"
+#~ "Ignorerer undtagelse fordi download blev annulleret. Undtagelse var: {0}"
 
 #~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Der var problemer med følgende udvidelser:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM."
-#~ msgstr[1] ""
-#~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM."
-
-#~ msgid "their version:"
-#~ msgstr "deres udgave:"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Fejl ved fortolkning"
-
-#~ msgid "resolved version:"
-#~ msgstr "udredet udgave:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt har konflikter:"
-#~ msgstr[1] "{0} objekter har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min udgave:"
-
-#~ msgid "File not found"
-#~ msgstr "Filen blev ikke fundet"
-
-#~ msgid "Rotate"
-#~ msgstr "Roter"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Fjern \"{0}\" for {1} \"{2}\""
-
-#~ msgid "Change"
-#~ msgstr "Skift"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Fjern \"{0}\" for {1} {2}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Løs {0} konflikter i {1} objekter"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Slet {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Slet {1} {0}"
-
-#~ msgid "Split way segment"
-#~ msgstr "Opdel vejstykke"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grader minutter sekunder"
-
-#~ msgid "W"
-#~ msgstr "V"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "anderledes"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sand"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert-zone (Frankrig)"
-
-#~ msgid "E"
-#~ msgstr "Ø"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fejl ved indlæsning af siden {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Åbn i browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online-hjælp"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Vis historisk information om OSM-veje eller -punkter"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Kunne ikke omdøbe filen \"{0}\""
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sammensæt veje med forskellige tilhørsforhold?"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Indtast værdier for alle konflikter."
+#~ "<html><strong>Flere rettesæt</strong> er nødvendige for at kunne uploade "
+#~ "{0} objekter. Hvilken strategi ønsker du at bruge?</html>"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr ""
+#~ "Indledning til OsmChange dokumentet er ikke skrevet endnu. Skriv venligst "
+#~ "først."
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk "
-#~ "sammensætte dem?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle vejene var tomme"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Åbn en side for globale indstillinger."
-
-#~ msgid "gps track description"
-#~ msgstr "beskrivelse af gps-spor"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Create a new map."
-#~ msgstr "Opret et nyt kort."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Send disse ændringer?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Send alle ændringer til OSM-serveren."
-
-#~ msgid "Uploading data"
-#~ msgstr "Sender data"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Der er uløste konflikter. Du skal løse disse først."
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Defekte sætninger: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Fejl ved kontrolsum: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Fejl ved NMEAimport!"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Ukendte sætninger: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Ingen kooordinater: "
-
-#~ msgid "Downloading..."
-#~ msgstr "Henter..."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakt {0}..."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Indtast en søgetekst."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Forventede slutparentes."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Intet dokument er åbent, så der er intet at gemme."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Nogle af punkterne er (næsten) på linjen"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Vælg først et bogmærke"
-
-#~ msgid "Occupied By"
-#~ msgstr "Optaget af"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Kunne ikke oprette ny fejlrapport. Resultat: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
-
-#~ msgid "change the viewport"
-#~ msgstr "skift synsfeltet"
-
-#~ msgid "load data from API"
-#~ msgstr "hent data fra API"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Tilladte handlinger"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Indtast venligst en søgestreng"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
+#~ "Mangler obligatoriske attributter for element ''bounds''. Har "
+#~ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', "
+#~ "origin=''{5}''."
+
+#~ msgid ""
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "En udvidelse, som tillader JOSM at blive styret fra andre programmer."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importér TCX-fil som GPS-spor"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Retningsindex '{0}' blev ikke fundet"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "nær"
+#~ "Liste over sammenlagte elementer. De vil erstate \"mine elementer\" når "
+#~ "sammenlægningsbeslutningerne er udført."
 
 #~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Zoom: Musehjul eller dobbeltklik. Flyt kort: Hold højre museknap nede og "
-#~ "flyt musen. Vælg: Klik"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importér TCX-fil..."
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Ret de valgte fejl."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorér de valgte fejl næste gang."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
+#~ "Der opstod en fejl under fortolkning af GPX-fil {0}. Kun en del af filen "
+#~ "vil være tilgængelig."
 
 #~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Denne test undersøger om to veje, jernbaner eller vandveje krydser i det "
-#~ "samme lag, uden at være forbundet til samme punkt."
-
-#~ msgid "start"
-#~ msgstr "start"
-
-#~ msgid "end"
-#~ msgstr "slut"
-
-#~ msgid "Request Update"
-#~ msgstr "Anmod om opdatering"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Åbn billeder med AgPifoJ..."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotaggede billeder"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Vis geotaggede billeder"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Jeg er i tidszonen: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Åbn et andet foto"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Billeder uden EXIF-position"
-
-#~ msgid "Update position for: "
-#~ msgstr "Opdater position for: "
-
-#~ msgid "All images"
-#~ msgstr "Alle billeder"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-spor hentet"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender-indstillinger"
-
-#~ msgid "Goods"
-#~ msgstr "Varer"
-
-#~ msgid "Boat"
-#~ msgstr "Båd"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorbåd"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Advarsel - brug af {0}-udvidelse blev anmodet. Udvidelsen er ikke længere "
-#~ "påkrævet."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Ugemte ændringer"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Du kan rette antallet af dage mellem denne advarsel vises<br>ved at "
-#~ "rette i indstillingen 'pluginmanager.warntime'.)"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Indtast venligst først de ønskede koordinater."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Forudindstillet gruppe \"{0}\""
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Tryk Genindlæs for at genopfriske listen"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Genopfrisk listen til udvælgelse."
-
-#~ msgid "Commit comment"
-#~ msgstr "Indsend kommentar"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fandt <member>-element i en ikke-relation."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Defekt id for punkt"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Prøv at opdatere til nyeste udgave af JOSM og alle udvidelser, før du "
-#~ "indsender en fejlrapport."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Åbner rettesæt..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Serveren undersøtter ikke rettesæt"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, måske på grund af manglende tags."
-
-#~ msgid "Tile Sources"
-#~ msgstr "Kilder til tern"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Vis status for tern"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Antal kabler"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motorsport"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Ret motorsport"
-
-#~ msgid "Edit Football"
-#~ msgstr "Ret amerikansk fodbold"
-
-#~ msgid "Football"
-#~ msgstr "Amerikansk fodbold"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Ret rugby"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitaristisk"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Edit Station"
-#~ msgstr "Ret station"
-
-#~ msgid "citymap"
-#~ msgstr "bykort"
-
-#~ msgid "map"
-#~ msgstr "kort"
-
-#~ msgid "bicyclemap"
-#~ msgstr "cykelkort"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Hent alle ufuldstændige veje og punkter der er forbundet"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-enhedens tidszone (forskel fra foto)"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS-slut: {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "tidszone-forskel: "
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Kunne ikke gemme bogmærke."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Kunne ikke læse bogmærker."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ADVARSEL: Kodeordet er gemt i klar tekst.<br>Det bliver sendt i "
-#~ "klar tekst til serveren, integreret i URLen.<br><br>Brug ikke et "
-#~ "værdifuldt kodeord.</b></html>"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Basis URLen for OSM serveren (REST API)"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Tilføj enten site-josm.xml eller Wiki-sider."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxyserver-vært"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Ydermere, genvejene aktiveres når handlingerne er tildelt til et "
-#~ "menupunkt for første gang. Så nogle af dine ændringer træder i kraft, "
-#~ "selv uden genstart - men også uden håndtering af overlappende genveje. "
-#~ "Dette er endnu en grund til at du bør <b>genstarte</b> JOSM efter at have "
-#~ "lavet nogen ændringer her.</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Bemærk at genvejstaster bliver tildelt til handlingerne, når JOSM "
-#~ "starter op. Du skal derfor <b>genstarte</b> JOSM for at dine ændringer "
-#~ "træder i kraft.</p>"
-
-#~ msgid "Set the language."
-#~ msgstr "Vælg sprog."
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Markeringen \"{0}\" bruges af relationen \"{1}\" med rollen {2}.\n"
-#~ "Slet fra relation?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Markeringen \"{0}\" bruges af relationen \"{1}\".\n"
-#~ "Slet fra relation?"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "I stedet for --download=<bbox> kan du angive osm://<bbox>\n"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Modstridende relation"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr "Udvidelsen {0} forekommer itu eller kunne ikke hentes automatisk."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Indstil sites..."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalag"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Vælg, flyt og rotér objekter"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Klik for at slette. Shift: Slet vejsegment. Alt: Slet ikke ubrugte "
-#~ "punkter, når en vej slettes. Ctrl: Slet refererende objekter."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Foren punkter med forskellige medlemsskaber?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Kan ikke forene punkter: Ville være nødt til at slette en vej, som "
-#~ "stadigvæk er i brug."
-
-#~ msgid "Drawbridge"
-#~ msgstr "Vindebro"
-
-#~ msgid "Portcullis"
-#~ msgstr "Faldgitter"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Vandvejs-punkt"
-
-#~ msgid "Open User Page"
-#~ msgstr "Åbn brugerside"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Åbn brugerside i browser"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Vis forfatterpanel"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Vælg brugerens data"
-
-#~ msgid "Please select some data"
-#~ msgstr "Vælg venligst noget data"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Beklager, virker ikke med anonyme brugere"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Dupliker valgte veje."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Dupliker vej"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ridesti"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cykelsti"
-
-#~ msgid "Footway"
-#~ msgstr "Gangsti"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Spor-niveau 3"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Spor-niveau 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Spor-niveau 1"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Ret vandring"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Spor-niveau 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Spor-niveau 4"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Ret krævende bjergvandring"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Alpevandring"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Bjergvandring"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Ret bjergvandring"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Krævende bjergvandring"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Ret alpevandring"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Send til OSM..."
-
-#~ msgid "Accomodation"
-#~ msgstr "Overnatning"
-
-#~ msgid "Amenities"
-#~ msgstr "Faciliteter"
-
-#~ msgid "Base Server URL"
-#~ msgstr "Grundlæggende URL til server"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Aktiver proxyserver"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Indstillinger for Fjernbetjeningsudvidelsen"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Vælg mindst én opgave til download"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Undlad at udføre ændringer"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Tomt medlem i relation."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Vej \"{0}\" med mindre end to punkter."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Slettede medlem \"{0}\" i relation"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Ingen ydre vej for multipolygon \"{0}\"."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Fejl: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Advarsel: {0}"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "multipolygon-vej \"{0}\" er ikke lukket."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
-
-#~ msgid "image not loaded"
-#~ msgstr "billedet er ikke indlæst"
-
-#~ msgid "requested: {0}"
-#~ msgstr "anmodet: {0}"
-
-#~ msgid "error loading metadata"
-#~ msgstr "fejl ved indlæsning af metaoplysninger"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS-URL"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Vælg venligst rækken, som skal kopieres."
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS-URL (standard)"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "bekræft alle Fjernbetjenings-handlinger manuelt"
-
-#~ msgid "World"
-#~ msgstr "Verden"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Ugyldig kombination af tag/værdi"
-
-#~ msgid "Painting problem"
-#~ msgstr "Farvelægger problem"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Vælg venligst en bruger fra forfatter-panelet"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lag: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Forfattere: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Kommando-stak: {0}"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Åbner OpenStreetBugs-vinduet og aktiverer den automatiske download"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Kun et punkt er valgt"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synkronisér tidspunkt med GPS-enhed"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet."
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambert-zone"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Tilpas positionen for WMS-laget"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Sæt {0}={1} for {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Sæt {0}={1} for {2} {3}"
-
-#~ msgid "History of Element"
-#~ msgstr "Elementets historik"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "Ignorerer en vej fordi den inkluderer et punkt, som ikke eksisterer: {0}\n"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} tilbage. Uploader {4}: {5} (id: {6})"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikter: {0}"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Arkivet over udvidelser er allerede tilgængeligt. Vil du hente den "
-#~ "nuværende version ved at slette det eksisterende arkiv?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Gem og afslut"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Vælg mindst en lukket vej, som skal forbindes."
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan ikke læse sted søgnings resultat fra serveren"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Slet lag"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Fjern alle valgte objekter fra relation"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Fjern valgt"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Løse konflikt"
-
-#~ msgid "Move Up"
-#~ msgstr "Flyt op"
-
-#~ msgid "Move Down"
-#~ msgstr "Flyt ned"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Returnér alle valgte objekter til den version, der er valgt i "
-#~ "historiklisten."
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relations-editor: {0}"
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kan ikke åbne mappen for indstillinger: {0}"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Slet og hent"
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Ukendt medlemstype for \"{0}\"."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Ukendt rolle \"{0}\"."
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sammensæt alligevel"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Løs konflikter"
-
-#~ msgid "Load Selection"
-#~ msgstr "Hent valgte"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Fortolkningsfejl i URL: \"{0}\""
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Kunne ikke læse fra URL: \"{0}\""
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' og 'Street' i enhver nøgle eller navn."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Baker Street\"</b> - 'Baker Street' i enhver nøgle eller navn."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' hvor som helst i navnet."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - intet 'Bak' i navnet."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objekt med det givne ID"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Ukendt filtype."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "En fejl opstod ved gendannelse af backup-fil."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Kunne ikke lave backup af fil."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "En fejl opstod under skrivning."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Tegn et vejsegment for at danne et rektangel."
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Det valgte må kun bestå af veje."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Kun to punkter er tilladt."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Denne handling kræver {0} individuelle download-anmodninger. Vil du "
-#~ "fortsætte?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Opdaterer det nuværende datalag fra serveren (genhenter data)"
-
-#~ msgid "Update Data"
-#~ msgstr "Opdater data"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Opret kopi af vej"
-
-#~ msgid "error requesting update"
-#~ msgstr "fejl ved anmodning af opdatering"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Autozoom: "
-
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsæt alligevel"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "DETTE ER PÅ FORSØGSBASIS. Gem dit arbejde og bekræft før afsendelse"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Jeg kan tage et billede af min GPS-modtager.<br>Hjælper det?</html>"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Det valgte billede rummer ingen tidsangivelse"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Billederne rummer ingen tidsangivelser"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
-
-#~ msgid "Default Values"
-#~ msgstr "Standardværdier"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Tidsforskel på {0} dage)"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Forskydning mellem spor og billeder: {0}m {1}s"
-
-#~ msgid "Public"
-#~ msgstr "Offentlig"
-
-#~ msgid "No username provided."
-#~ msgstr "Intet brugernavn er angivet."
-
-#~ msgid "help"
-#~ msgstr "hjælp"
-
-#~ msgid "Exception occurred"
-#~ msgstr "En undtagelse opstod"
-
-#~ msgid "Help / About"
-#~ msgstr "Hjælp / Om"
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Maks. zoomniveau: "
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Maks. højde (meter)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Maks. bredde (meter)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Maks. længde (meter)"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Ret et spor af første niveau"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Ret et spor af andet niveau"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Ret et spor af tredje niveau"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Ret et spor af fjerde niveau"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Ret et spor af femte niveau"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Krævende alpevandring"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Ret krævende alpevandring"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Hård alpevandring"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Ret hård alpevandring"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Ret en vindebro"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Ret et faldgitter"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Sammenflet alligevel"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "De valgte punkter tilhører forskellige relationer. Vil du stadigvæk "
-#~ "sammenflette dem?"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede "
-#~ "elementer har en historik."
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Følgende fejl opstod under den samlede download:"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr "Brug <b>\"</b> for at angive operatorer (fx hvis key indeholder : )"
-
-#~ msgid "RX"
-#~ msgstr "Regulært udtryk"
-
-#~ msgid "CS"
-#~ msgstr "Versalfølsom"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Mangler argumenter for \"eller\"."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Mangler argument fro \"ikke\"."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Ikke-vej \"{0}\" i multipolygon."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Maksimal længde (i meter) at tegne linjer. Sæt til '-1' for at tegne alle "
-#~ "linjer."
-
-#~ msgid "CI"
-#~ msgstr "Ikke-versalfølsom"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Skift fra og til Fuldskærm"
-
-#~ msgid "Full Screen"
-#~ msgstr "Fuldskærm"
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Adskillige funktioner, der gør dit arbejde lettere: Fx forenkl vej, "
-#~ "sammensæt områder, spring til position."
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Hent korrigeret billede fra Metacartas Map Recitifier WMS"
-
-#~ msgid "optician"
-#~ msgstr "optiker"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Du kan tilføje, rette og slette WMS-enheder i WMSudvidelses-"
-#~ "indstillingsfanebladet - de vil derefter blive vist i WMS-menuen.\n"
-#~ "\n"
-#~ "Du kan også rette dette manuelt i avancerede indstillinger ved at bruge "
-#~ "følgende notation:\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"
-#~ "Eksempel på fuld WMS URL-inputformat (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/  skal "
-#~ "du kun bruge det relevante 'id' som input..\n"
-#~ "Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en "
-#~ "URL manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-"
-#~ "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"
-#~ "Bemærk: Vær sikker på at billedet er hensigtsmæssigt at bruge ud fra "
-#~ "ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge "
-#~ "billedet."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
-#~ "href=\"{1}\">dit eget sprog</a>."
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Intet data til opdatering. Har du allerede åbnet eller downloadet et "
-#~ "datalag?"
-
-#~ msgid "Jump forward"
-#~ msgstr "Hop fremad"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Hurtigere fremad"
-
-#~ msgid "Jump back."
-#~ msgstr "Hop tilbage."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Langsommere fremad"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- nuværende version er {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til "
-#~ "{0}."
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Indstillinger for WMS-udvidelse"
-
-#~ msgid "Copy Default"
-#~ msgstr "Kopier standardværdi"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Projektionen kunne ikke læses fra indstillinger. Bruger EPSG:4326 (WGS84)"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Farver punkter og spor-segmenter ud fra opløsning af position (HDOP). Din "
-#~ "sporingsenhed skal logge denne information."
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "nuværende forskel: {0}s"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Intern fejl: kan ikke tjekke omstændighederne for manglende lag. "
-#~ "Rapportér venligst dette som en fejl."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Mere end én \"til\"-vej blev fundet."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Mere end én \"fra\"-vej blev fundet."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Mere end én \"via\" blev fundet."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Ingen \"til\"-vej blev fundet."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Ingen \"fra\"-vej blev fundet."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Intet \"via\"-punkt eller vej blev fundet."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Indre vej \"{0}\" er på ydersiden."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Maksimal længde (i meter) at tegne linjer for lokale filer. Sæt til '-1' "
-#~ "for at tegne alle linjer."
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Endnu ikke taggede billeder"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} blev fundet, som skal gps-tagges"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert Zone 1 cache-fil (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert Zone 3 cache-fil (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert Zone 2 cache-fil (.2)"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Byen {0} blev ikke findet eller er ikke tilgængelig i WMS.\n"
-#~ "Tjek dens tilgængelighed på www.cadastre.gouv.fr"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert Zone 4 cache-fil (.4)"
-
-#~ msgid "Fix relations"
-#~ msgstr "Ret relationer"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Sammenlæg områder: Fjern korte veje"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Ret lufthavn"
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Det primære formål med udvidelsen er muligheden for at slette punkter i "
-#~ "GPX-spor. Udvidelsen kan bruges til at bearbejde spor til upload to OSM, "
-#~ "fx ved at slette ligegyldige dele af sporet."
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Redigér informationskontor"
-
-#~ msgid "Map Type"
-#~ msgstr "Kort type"
-
-#~ msgid "hikingmap"
-#~ msgstr "vandrekort"
-
-#~ msgid "More details"
-#~ msgstr "Flere detaljer"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Ukendt version: {0}"
-
-#~ msgid "Zone"
-#~ msgstr "Zone"
-
-#~ msgid "autozoom"
-#~ msgstr "autozoom"
-
-#~ msgid "Closed Way"
-#~ msgstr "Lukket vej"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a> eller <a "
-#~ "href=\"{1}\">dit sprog</a>."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projiceringen \"{0}\" er kun beregnet for\n"
-#~ "breddegrader mellem 46,1° og 57°.\n"
-#~ "Brug et andet projiceringssystem, hvis du ikke benytter\n"
-#~ "en fransk WMS-server.\n"
-#~ "Upload ikke noget data efter denne besked."
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Projiceringen kunne ikke indlæses fra indstillingerne. Benytter Mercator."
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Skift først projiceringen til {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ugyldig projicering"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projiceringen \"{0}\" er kun beregnet for\n"
-#~ "breddegrader mellem 45,7° og47,9°.\n"
-#~ "Brug et andet projiceringssystem, hvis du ikke arbejder\n"
-#~ "med et datasæt fra Schweiz eller Liechtenstein.\n"
-#~ "Upload ikke noget data efter denne besked."
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Hvis du vil aktivere Cadastre-WMS-udvidelsen, så ret\n"
-#~ "JOSM-projiceringen til Lambert og genstart"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Projiceringen kunne ikke indlæses fra indstillingerne. Benytter Mercator."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, gendan også dem"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nej, fortryd handlingen"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Ingen af denne vejs punkter er forbundet til noget andet."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Du benytter EPSG:4326-projiceringen, hvilket kan føre<br>til "
-#~ "uønskede resultater, når der foretages rektangulære tilpasninger.<br>Ret "
-#~ "projiceringen for at fjerne denne advarsel.<br>Vil du fortsætte?"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Gendanner vej..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Tjekker om punktet {0} er væk ..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Gendanner relation..."
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Der er {0} yderligere punkter, som benyttes af vejen {1}<br>som er "
-#~ "slettet på serveren.<br><br>Ønsker du også at gendanne disse punkter?</"
-#~ "html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Gendan yderligere punkter?"
-
-#~ msgid "Keep mine"
-#~ msgstr "Behold mine"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Tjekker om primitiven {0} er væk ..."
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Gendan afhængige primitiver?"
-
-#~ msgid "Delete mine"
-#~ msgstr "Slet mine"
-
-#~ msgid "Update Selection"
-#~ msgstr "Opdater det valgte"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Kunne ikke finde primitiven med id {0} i det nuværende datasæt"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Mangler primitiv"
-
-#~ msgid "Update failed"
-#~ msgstr "Opdateringen fejlede"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "uventet svar. Modtog {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitiven er slettet på serveren"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Der er ingen valgte primitiver at opdatere."
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Opdaterer de valgte primitiver fra serveren"
-
-#~ msgid "Selection too big"
-#~ msgstr "Der er valgt for meget"
-
-#~ msgid "Uploading"
-#~ msgstr "Sender"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Opdaterer primitiv"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synkronisér kun {0} {1}"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Der er opdaget en konflikt"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upload til OSM-API'et fejlede"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Slettede eller flyttede primitiver"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Kunne ikke oprette forbindelse til OSM-serveren {0}.\n"
-#~ "Tjek server-URL'en i dine indstillinger samt din internetforbindelse."
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiven er allerede slettet"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Følgende fejl opstod under masse-download:"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Fjerner 1 primitiv"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Gendan {0} primitiver"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Løs {0} tag-konflikter i {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Løs konflikter i punktlisten for vejen {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Løs versionskonflikter for {0} {1}"
-
-#~ msgid "changeset"
-#~ msgstr "rettesæt"
-
-#~ msgid "changesets"
-#~ msgstr "rettesæt"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\""
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{1}\""
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\""
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Fandt ikke en primitiv med id {0} i dette datasæt"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Der er ingen primitiver med versionen {0} i denne historik"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parameteren \"{0}\" forventes i omfanget 0..{1}, modtog {2}"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parameteren \"{0}\" må ikke være en null-værdi"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Tags ({0} konflikter)"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Flyt de valgte elementer ét trin op"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Flyt de valgte elementer ét trin ned"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "uventet kolonne-indeks. Modtog {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Parameteren 'col' skal være 0 eller 1. Modtog {0}"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Login-navn (e-mail) til OSM-kontoen."
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM-brugernavn (e-mail)"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Versionsnummer mangler fra OSM-data."
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} udvidelse blev succesfuldt hentet ned. Genstart venligst JOSM."
-#~ msgstr[1] ""
-#~ "{0} udvidelser blev succesfuldt hentet ned. Genstart venligst JOSM."
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}."
-
-#~ msgid "Fade background: "
-#~ msgstr "Nedton baggrund: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Hent tern automatisk: "
-
-#~ msgid "Optional"
-#~ msgstr "Valgfri"
-
-#~ msgid "% of lat:"
-#~ msgstr "% af bredde:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% af længde:"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Endnu en geotag-udvidelse for JOSM. Sammeholder billeder med GPS-spor "
-#~ "samt importerer EXIF-geotaggede billeder."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Hent TCX-filer direkte fra JOSM."
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Kunne ikke opstarte API'et. Prøv igen senere."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Opstart af API'et fejlede"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Det nuværende antal ændringer overskrider det maksimale antal; nuværende "
-#~ "er {0}, maksimum er {1}"
-
-#~ msgid "No data"
-#~ msgstr "Intet data"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Kunne ikke opdatere de valgte primitiver."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikt i data"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parameter \"{0}\" må ikke være null"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Hent tilknytninger fra OSM..."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Henter tilknytninger"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
-#~ msgstr[1] ""
-#~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Henter forældre til primitivet {2}"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Luk det nuværende rettesæt ..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Luk nuværende rettesæt"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "til {0} primitiv"
-#~ msgstr[1] "til {0} primitiver"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Der er ingen rettesæt åbne."
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Fandt ikke en primitiv med id {0} i det nuværende rettesæt"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a> eller <a "
-#~ "href=\"{1}\">dit sprog</a>."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Fandt ikke en primitiv med id {0} i dette datasæt"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
-#~ "href=\"{1}\">dit eget sprog</a>."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "uventet svar. Modtog {0}"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Der er ingen primitiver med versionen {0} i denne historik"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Kunne ikke læse \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Vælg om data skal downloades til et nyt lag"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Vis i fuldskærm"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Indtast venligst en breddegrad i området -90..90"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Du er ved at åbne {0} browser vinduer.<br>Dette vil måske både overdænge "
-#~ "din skærm med browser vinduer<br>og tage noget tid at gøre."
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Indtast venligst en gyldig breddegrad i området -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Indtast venligst en gyldig længdegrad i området -180..180"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Indtast venligst en længdegrad i området -180..180"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Fandt ikke et objekt med id {0} i det aktuelle datasæt"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Der er uløste konflikter i lag ''{0}''.<br>Du er nødt til at løse "
-#~ "dem først.</html>"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Flyt altid og vis ikke dialogen igen"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Indtast venligst en filter tekst"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Forventede instans af OsmDataLayer eller GpxLayer. Fik ''{0}''."
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Åbner {0} filer..."
-
-#~ msgid "Bikes"
-#~ msgstr "Cykler"
-
-#~ msgid "black"
-#~ msgstr "sort"
-
-#~ msgid "brown"
-#~ msgstr "brun"
-
-#~ msgid "red"
-#~ msgstr "rød"
-
-#~ msgid "blue"
-#~ msgstr "blå"
-
-#~ msgid "gray"
-#~ msgstr "grå"
-
-#~ msgid "white"
-#~ msgstr "hvid"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Brug decimalgrader"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Indtast koordinater for det nye punkt"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikter under download"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Forbandt selv-overlappende område"
-
-#~ 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 ""
-#~ "De(n) valgte vej(e) har punkter udenfor den downloadede data region.\n"
-#~ "Dette kan bevirke at nogle punkter bliver slettet uhensigtsmæssigt.\n"
-#~ "Er du virkelig sikker på at du vil fortsætte?"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Vælg mindst to punkter, der skal lægges sammen."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Nar {0} punkter ind i {1} punkter"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Træk et vejsegment for at lave et rektangel. Ctrl-træk for at flytte et "
-#~ "segment langs dets normale."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>There are {0} primitiver i dit lokale datasæt, som<br>risikerer at "
-#~ "blive slettet på serveren. Hvis du senere forsøger at slette "
-#~ "eller<br>opdatere dem, rapporterer serveren sandsynligvis en<br>konflikt."
-#~ "<br><br>Klik <strong>{1}</strong> for at tjekke disse primitivers "
-#~ "status<br>på serveren.<br>Klik <strong>{2}</strong> for at ignorere.<br></"
-#~ "html>"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Tilføjede {0} objekter"
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "Ukorrekt værdi af versions-operatør: {0}. Tal forventes."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Ukorrekt værdi af id-operatør: {0}. Tal forventes."
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr "Ukorrekt værdi af rettesæts-operatør: {0}. Tal forventes."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Advarsel: Lag ''{0}'' eksisterer ikke længere. Kan ikke fjerne konflikt "
-#~ "for primitiv ''{1}''."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Lag ''{0}'' har allerede en konflikt for primitiv<br>''{1}''."
-#~ "<br>Denne konflikt kan ikke tilføjes.</html>"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr "Mindst et objekt at slette krævet. Har tom samling."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter ''{0}'' må ikke være tom"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Sæt 'modificeret' flaget for vej {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Sæt 'modificeret' flaget for relation {0}"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Sæt 'modificeret' flaget for punkt {0}"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Fjerner reference fra relation {0}"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Løs versions konflikter for relation {0}"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Løs versions konflikter for vej {0}"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Udrensede objekt ''{0}''"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Udrensede {0} objekter"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Advarsel: Udrenser vej {0}, fordi antal punkter faldt til under 2. "
-#~ "Nuværende er {1}"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Løs versions konflikter for punkt {0}"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Luk dialogen uden at oprette et nyt punkt"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>Denne relation er blevet ændret udenfor editoren.<br>Du kan ikke "
-#~ "tage dine ændringer i anvendelse og fortsætte redigeringen.<br><br>Ønsker "
-#~ "du at oprette en konflikt og lukke editoren?</html>"
-
-#~ msgid ""
-#~ "Can''t create a changeset query including both the query parameters "
-#~ "''uid'' and ''display_name''"
-#~ msgstr ""
-#~ "Kan ikke oprette en rettesæts-forespørgsel, der inkluderer begge "
-#~ "forespørgsels-parametrene \"uid\" og \"display_name\""
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr ""
-#~ "Opret markører der ikke har noget med lyd at gøre, når der læses GPX-data."
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Opret multipolygoner med et klik. Meget nemmere end standardmåden med "
-#~ "relationseditoren."
-
-#~ msgid "create new objects"
-#~ msgstr "Opret nye objekter"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Tillader brugeren at oprette forskellige farvesystemer og skifte mellem "
-#~ "dem. Ændr blot farverne og opret et nyt system. Bruges til at skifte til "
-#~ "en hvid baggrund med matchende farver for bedre synlighed i skarpt "
-#~ "sollys. Se dialog i JOSM's indstillinger og 'Map Settings' (underligt men "
-#~ "sandt :-)"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Netlag:"
-
-#~ msgid "Grid layout"
-#~ msgstr "Netlayout"
-
-#~ msgid "Add grid"
-#~ msgstr "Tilføj net"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Net rotation"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Netoprindelsessted"
-
-#~ msgid "Grid"
-#~ msgstr "Net"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Stil et baggrundslag til rådighed, der viser et kortnet"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "Advarsel: uventet format af API base URL. Redirektion til info or "
-#~ "historik side for OSM primitiv vil sandsynligvis fejle. API base URL er: "
-#~ "''{0}''"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Slå fuldskærmsvisning til/fra"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=rute</b> - nøgle 'type' med værdi = præcist 'rute'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - nøgle 'type' med hvilkensomhelst værdi. Prøv også "
-#~ "<b>*=værdi</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Mønster-syntaks-fejl: Mønster {0} i {1} er ulovlig!"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Manglende højre parantes"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Forkert antal parametre for tags operatør"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Ukorrekt værdi af tags operatør: {0}. Tags operatøren forventer antal af "
-#~ "tags eller et interval, for eksempel tags:1 eller tags:2-5"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Forkert antal parametre for punkt operatør."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Ukorrekt værdi af punkt operatør: {0}. Punkt operatøren forventer antal "
-#~ "punkter eller et interval, for eksempel punkter:10-20"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parameter ''{0}'' > 0.0 forventet, fik {1}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Ulovlig double værdi {0}"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Fejl: Uventet linje ''{0}'' i bogmærkeliste fra server"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr "Kunne ikke hente resource ''{0}''. Fejl er {1}"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr ""
-#~ "Er ikke i stand til at tilføje primitiv {0} til datasættet fordi den "
-#~ "allerede er inkluderet"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -45572,1515 +43551,10 @@
 #~ "ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde."
 
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Kunne af sikkerhedsårsager ikke hente bogmærke fra \"{0}\". Undtagelse "
-#~ "var: {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Manglende sammenlægningsmål for objekt med id {0}"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Can''t deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Målobjekt med id {0} og version {1} er synlig selvom kildeobjekt med "
-#~ "lavere version {2} ikke er synlig. Kan ikke håndtere denne inkonsistens. "
-#~ "Beholder målobjekt. "
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "Tag-samlingen kan ikke bruges med en primitiv fordi der er nøgler med "
-#~ "flere værdier."
-
-#~ msgid ""
-#~ "Can''t merge because either of the participating primitives is new and "
-#~ "the other is not"
-#~ msgstr ""
-#~ "Kan ikke sammenlægge fordi en af de involverede primitiver er ny og den "
-#~ "anden ikke er det."
-
-#~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
-#~ msgstr ""
-#~ "Kan ikke tildele et rettesætsID > 0 til en ny primitiv. Værdi af "
-#~ "rettesætsID er {0}."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Parameter \"{0}\" >= 0 forventet. Fik {1}."
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Forventet ID >= 0. Fik {0}."
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "En primitiv med ID = 0 kan ikke være usynlig."
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "Kan ikke sammenlægge primitiver med forskellige IDs. Denne ID er {0}, "
-#~ "mens den anden er {1}."
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Stil for indre vej \"{0}\" er lig med multipolygon."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Stil for ydre vej \"{0}\" passer ikke sammen."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Stil for restriktion {0} ikke fundet."
-
-#~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "Kan ikke sammenligne primitiv med ID \"{0}\" med primitiv med ID \"{1}\"."
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Kunne ikke skrive bogmærke.<br>{0}</html>"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Frankrig)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 North Geodesic system"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Glidende kort"
-
-#~ msgid "SlippyMap"
-#~ msgstr "Glidende mappe"
-
-#~ msgid "Confirmation"
-#~ msgstr "Bekræftelse"
-
-#~ msgid "Travel"
-#~ msgstr "Rejse"
-
-#~ msgid "football"
-#~ msgstr "amerikansk fodbold"
-
-#~ msgid "underwater"
-#~ msgstr "undervands"
-
-#~ msgid "tower"
-#~ msgstr "tårn"
-
-#~ msgid "overground"
-#~ msgstr "på land"
-
-#~ msgid "line"
-#~ msgstr "linie"
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Kommunikation med server fejlede"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "ikke synlig (på server)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "synlig (på server)"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Nulstil ID til 0"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ja, nulstil ID"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Fjern fra datasæt"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Parameter ''{0}'' må ikke være tom."
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Lukket"
-
-#~ msgid "User ID: "
-#~ msgstr "Bruger ID: "
-
-#~ msgid "User name: "
-#~ msgstr "Bruger navn: "
-
-#~ msgid "No, don't apply"
-#~ msgstr "Nej, anvend den ikke"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Uploader {0} objekter ..."
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "spor"
-#~ msgstr[1] "spor"
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "Kigger efter tilgængelige oversættelser..."
-
-#~ msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-#~ msgstr "<html>Kunne ikke læse filer.<br> Fejl er: <br>{0}</html>"
-
-#~ msgid "Uploading {0} objects..."
-#~ msgstr "Uploader {0} objekter..."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Genstart venligst JOSM."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "Bemærk: For nogle opgave behøver JOSM en masse hukommelse. Det kan være "
-#~ "nødvendigt at tilføje den følgende\n"
-#~ "      Java option for at øge den tildelte hukommelses maksimumstørrelse."
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} uafklarede tagkonflikter der skal løses"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "Parameter ude af intervalområde. Fik {0}."
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge "
-#~ "resolutionskommando."
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>En fejl opstod under kommunikation med serveren<br>Detaljer: {0}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Justerbar {0} ikke registreret endnu. Kan ikke sætte deltagelse i "
-#~ "synkroniseret justering."
-
-#~ msgid "Visible State:"
-#~ msgstr "Synlig status:"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Slet fysisk fra lokal datasæt"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Behold en klon af den lokale version."
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>For at beholde din lokale version, er JOSM<br>nødt til at nulstille "
-#~ "primitiv {0}'s ID til 0.<br>Ved næste upload vil serveren tildele<br>den "
-#~ "en ny ID.<br>Indvilliger du?</html>"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Behold deres synlige status"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Behold min slettede status"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Der er {0} flere primitiver som relation {1} refererer til<br>og "
-#~ "som er slettet på serveren.<br><br>Ønsker du at omgøre sletningen af dem "
-#~ "også?</html>"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge "
-#~ "resolutionskommando"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ja, udrens det"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM vil være nødt til at fjerne din lokale primitiv med ID {0}"
-#~ "<br>fra datasættet.<br>Indvilliger du?</html>"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Omgør beslutning om konflikt mellem synlige status"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "Parameter \"{0}\" med tags for præcist en nøgle forventet. Fik {1}."
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "Tagsamling indeholder ikke den markerede værdi \"{0}\""
-
-#~ msgid "Apply also for children"
-#~ msgstr "Anvend også for børn"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialog ikke oprettet endnu. Start createInstance() først"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Markér primitiver indsendt af denne bruger"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr "Forventede heltalsværdi > 0 for parameter ''{0}''. Fik ''{1}''"
-
-#~ msgid ""
-#~ "<html>The selected object isn''t available in the current<br>edit layer "
-#~ "''{0}''.</html>"
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer ''{0}''.</html>"
-#~ msgstr[0] ""
-#~ "<html>Det markerede objekt er ikke tilgængeligt i det "
-#~ "nuværende<br>redigeringslag ''{0}''.</html>"
-#~ msgstr[1] ""
-#~ "<html>Ingen af de markerede objekter er tilgængelige i det "
-#~ "nuværende<br>redigeringslag ''{0}''.</html>"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Zoom til de tilsvarende primitiver i det nuværende datalag"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Zoom til primitiverne i dette rettesæts indhold i det nuværende datalag"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Indtast et rettesætsID"
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr ""
-#~ "Den nuværende værdi er ikke et gyldigt rettesætsID. Indtast venligst en "
-#~ "heltalsværdi > 0."
-
-#~ msgid ""
-#~ "Can't build changeset query with time based restrictions. Input isn't "
-#~ "valid."
-#~ msgstr ""
-#~ "Kan ikke forme rettesætsforespørgsel med tidsbaserede begrænsninger. "
-#~ "Input er ikke gyldigt."
-
-#~ msgid "Can''t restrict the changeset query to the user name ''{0}''"
-#~ msgstr "Kan ikke begrænse rettesætsforespørgslen til brugernavnet \"{0}\""
-
-#~ msgid ""
-#~ "Can't restrict changeset query to the current user because the current "
-#~ "user is anonymous"
-#~ msgstr ""
-#~ "Kan ikke begrænse rettesætsforespørgsel til den nuværende bruger, fordi "
-#~ "den nuværende bruger er anonym"
-
-#~ msgid "Current value ''{0}'' for user ID isn''t valid"
-#~ msgstr "Nuværende værdi ''{0}'' for brugerID er ikke gyldig"
-
-#~ msgid ""
-#~ "Can''t restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Kan ikke begrænse rettesætsforespørgslen til et specifikt "
-#~ "afgrænsningsfelt. Inputtet er ugyldigt."
-
-#~ msgid ""
-#~ "The current value isn't a valid user ID. Please enter an integer value > 0"
-#~ msgstr ""
-#~ "Den nuværende værdi er ikke et gyldigt brugerID. Indtast venligst en "
-#~ "heltalsværdi > 0"
-
-#~ msgid ""
-#~ "<html>The  current value isn't a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr ""
-#~ "<html>Den nuværende værdi er ikke et gyldigt brugernavn.<br>Indtast "
-#~ "venligst et ikke-tomt brugernavn.</html>"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Markér for at begrænse forespørgslen til kun dine rettesæt."
-#~ "<br>Afmarkér for at inkludere alle rettesæt i forespørgslen.</html>"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Børnerelationen<br>{0}<br>er slettet fra serveren. Den kan ikke "
-#~ "hentes."
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Denne relation har allerede en eller flere medlemmer der refererer "
-#~ "til<br>primitiven ''{0}''<br><br>Ønsker du virkelig at tilføje endnu et "
-#~ "relationsmedlem?</html>"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Markér primitiver for markerede relationsmedlemmer"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Fjern alle medlemmer der refererer til en af de markerede primitiver"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Flere medlemmer der refererer til samme primitiv."
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Tilføj alle primitiver markeret i det nuværende datasæt før det først "
-#~ "markerede medlem"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Tilføj alle primitiver markeret i det nuværende datasæt efter det sidst "
-#~ "markerede medlem"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Tilføj alle primitiver markeret i det nuværende datasæt før det første "
-#~ "medlem"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Tilføj alle primitiver markeret i det nuværende datasæt efter det sidste "
-#~ "medlem"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr ""
-#~ "Klik for at returnere til relationseditoren og genoptage redigeringen"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Lag ''{0}'' har allerede en konflikt for primitiv<br>''{1}''."
-#~ "<br>Løs venligst denne konflikt først og prøv så igen.</html>"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Du giver {0} primitiver en tom rolle.<br>Dette svarer til at slette "
-#~ "disse primitivers roller.<br>Ønsker du virkelig at anvende den nye rolle?"
-#~ "</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Værdi af child.getId() > 0 forventet. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameteren ''{0}'' må ikke være en null-værdi"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Kunne ikke læse filen ''{0}''<br> Fejlen er: <br>{1}</html>"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr ""
-#~ "Advarsel: Ignorerer undtagelse fordi opgave blev annulleret. Undtagelse "
-#~ "var: "
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "Strengen ''{0}'' er ikke en gyldig double-værdi"
-
-#~ msgid "Warning: bad location in HTML document. Exception was: "
-#~ msgstr "Advarsel: Dårligt sted i HTML dokument. Undtagelse var: "
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Parameter ''{0}'' > 0 forventet. Fik {1}"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Objekt-ID > 0 forventet. Fik {0}"
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "ID i parameter ''{0}'' > 0 forventet. Fik {1}."
-
-#~ msgid ""
-#~ "Failed to update primitive with id {0} because current edit layer doesn't "
-#~ "include such a primitive"
-#~ msgstr ""
-#~ "Kunne ikke opdatere primitiv med ID {0} fordi det nuværende "
-#~ "redigeringslag ikke indeholder sådan en primitiv"
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Godkendelse af HTTP proxyen ''{0}'' mislykkedes. Indtast venligst "
-#~ "et gyldigt brugernavn og en gyldig adgangskode.</html>"
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "Indtast venligst din OSM-kontos adgangskode"
-
-#~ msgid ""
-#~ "<html>Warning: depending on the authentication method the proxy server "
-#~ "uses the password may be transferred unencrypted.</html>"
-#~ msgstr ""
-#~ "<html>Advarsel: Afhængigt af godkendelsesmetoden proxy-serveren bruger, "
-#~ "kan kodeordet blive overført ukrypteret.</html>"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Login-adgangskode til OSM-kontoen. Efterlad tom for ikke at gemme nogen "
-#~ "adgangskode."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>Advarsel: Adgangskoden er gemt i klartekst i indstillingsfilen."
-#~ "<br>Adgangskoden bliver overført i klartekst til serveren, kodet i URL'en."
-#~ "<br><b>Brug ikke en værdifuld adgangskode.</b></html>"
-
-#~ msgid "No password provided."
-#~ msgstr "Ingen adgangskode er angivet."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM-adgangskode"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Kan ikke fortryde kommando ''{0}'', fordi lag ''{1}'' ikke er tilstede "
-#~ "længere"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Indtast en upload-kommentar (min. 3 tegn)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Indtast en kommentar for dette upload-rettesæt (min 3 tegn)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Ulovlig upload-kommentar"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Advarsel: Primitiv  ''{0}'' er allerede slettet fra serveren. Skipper "
-#~ "denne primitiv og prøver at uploade igen"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Gør primitiver klar til upload ..."
-
-#~ msgid "({0}/{1}) Uploading {2} objects..."
-#~ msgstr "({0}/{1}) Uploader {2} objekter..."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Data med fejl. Upload alligevel?"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Download primitiver, der refererer til en af de valgte primitiver."
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Du er ved at slette punkter uden for det område du har downloadet."
-#~ "<br>Dette kan medføre problemer, fordi andre objekter (som du ikke kan "
-#~ "se) måske bruger dem.<br>Ønsker du virkelig at slette?"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Fejl under download"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Download og vis de markerede primitivers historik"
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>JOSM kører nu med en anonym bruger. Den kan ikke downloade<br>dine "
-#~ "rettesæt fra OSM-serveren medmindre du indtaster dit OSM-brugernavn<br>i "
-#~ "JOSM-indstillingerne.</html>"
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: Downloader relation ''{2}''..."
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Nuværende downloadområde</strong> (minlat, minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "Download Area"
-#~ msgstr "Download område"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Klik for at downloade det nu markerede område"
-
-#~ msgid "Download List"
-#~ msgstr "Download liste"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} Udvidelse problemfrit downloadet."
-#~ msgstr[1] "{0} Udvidelse problemfrit downloadet."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Download udvidelsesinformationer fra {0} site"
-#~ msgstr[1] "Download udvidelsesinformationer fra {0} sites"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Downloader udvidelser"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Download manglende udvidelser"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Download følgende udvidelser? \n"
-#~ " \n"
-#~ "{0}"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Download WMS-tern fra {0}"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Kun op til to områder kan forenes i øjeblikket"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" er ikke lukket og kan derfor ikke forenes."
-
-#~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
-#~ msgstr " (<a href=\"urn:changeset-configuration\">konfigurér rettesæt</a>)"
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} lag bør gemmes, men har en tilknyttet fil<br> som ikke kan "
-#~ "skrives.<br>Vælg enten en anden fil til dette lag eller kassér "
-#~ "ændringerne.<br>Lag med en ikke-skrivbar fil:</html>"
-#~ msgstr[1] ""
-#~ "<html>{0} lag bør gemmes, men har en tilknyttet fil<br> som ikke kan "
-#~ "skrives.<br>Vælg enten en anden fil til hver af dem eller kassér "
-#~ "ændringerne.<br>Lag med ikke-skrivbare filer:</html>"
-
-#~ msgid ""
-#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
-#~ "to map editing.<br>"
-#~ msgstr ""
-#~ "Klik ''<strong>{0}</strong>'' for at fortsætte upload til flere nye "
-#~ "rettesæt.<br>Klik ''<strong>{1}</strong>'' for at gå tilbage til upload-"
-#~ "dialogen.<br>Klik ''<strong>{2}</strong>'' for at afbryde upload og gå "
-#~ "tilbage til kortredigering.<br>"
-
-#~ msgid ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-#~ msgstr ""
-#~ "Serveren rapporterede at det nuværende rettesæt blev lukket.<br>Dette "
-#~ "skyldes højst sandsynligt at rettesættets størrelse overskred de "
-#~ "maksimale {0} objekter på serveren ''{1}''."
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
-#~ "<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde "
-#~ "ud af hvordan de hænger sammen med billeder.</html>"
-
-#~ msgid ""
-#~ "<html>Can''t upload {0} objects in one request because the<br>max. "
-#~ "changeset size {1} on server ''{2}'' is exceeded.</html>"
-#~ msgstr ""
-#~ "<html>Kan ikke uploade {0} objekter i en anmodning fordi den<br>maksimale "
-#~ "rettesætsstørrelse {1} på server ''{2}'' er overskredet.</html>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
-#~ "<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde "
-#~ "ud af hvordan de hænger sammen med lyddata.</html>"
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
-#~ msgstr "<html>Matchede <b>{0}</b> af <b>{1}</b> fotos med GPX-spor."
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Musehjul, dobbeltklik eller Ctrl + op/ned.<b>Flyt kort:</b> "
-#~ "Hold højre museknap og flyt musen eller brug piletaster. <b>Markér:</b> "
-#~ "Hold venstre museknap og træk en ramme."
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Min. zoomniveau: "
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Saml de nu markerede primitiver i et andet lag"
-
-#~ msgid "image "
-#~ msgstr "billede "
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Viser et OpenLayers baggrundsbillede"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Endnu en udvidelse til at afstemme billeder med waypoints i en GPX-fil. "
-#~ "Et match sker når et waypoint-tags 'name', 'cmt' eller 'desc' attributter "
-#~ "stemmer med et billedes filnavn."
-
-#~ msgid "Active styles"
-#~ msgstr "Aktive stile"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Vej omkring område er ikke lukket."
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Tilgængelige stile (fra {0})"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Tilføj et filnavn eller en URL for en aktiv stil"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Server svarede med svarkode 404. Prøver igen med en individuel anmodning "
-#~ "for hver primitiv."
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Kunne af sikkerhedsårsager ikke åbne en forbindelse "
-#~ "til<br>''{0}''<br>. Dette skyldes højst sandsynligt at du kører<br>en "
-#~ "applet og at du ikke hentede din applet fra ''{1}''.</html>"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Kunne ikke åbne en forbindelse til serveren<br>''{0}''."
-#~ "<br>Værtsnavn ''{1}'' kunne ikke findes. <br>Tjek venligst API-URL'en i "
-#~ "dine indstillinger og din internetforbindelse.</html>"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Advarsel: Kunne ikke initialisere indstillinger. Indstillingsmappe "
-#~ "\"{0}\" er ikke en mappe."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Kunne ikke initialisere indstillinger.<br>Indstillingsmappe ''{0}'' "
-#~ "er ikke en mappe.</html>"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Kan ikke åbne mappe.<br>Vælg venligst en fil!"
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Advarsel: Kunne af sikkerhedsårsager ikke få adgang til mappen ''{0}''. "
-#~ "Undtagelsen var: {1}"
-
-#~ 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] ""
-#~ "Markeringen indeholder {0} vej. Er du sikker på at du ønsker at forenkle "
-#~ "den?"
-#~ msgstr[1] ""
-#~ "Markeringen indeholder {0} veje. Er du sikker på at du ønsker at forenkle "
-#~ "dem alle?"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Flyt objekter ved at trække; Shift for at føje til markering (Ctrl for at "
-#~ "slå til/fra); Shift-Ctrl for at rotere markeringen; eller ændre markering"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametre læses i den orden de angives, så vær sikker på at du indlæser\n"
-#~ "nogle data før --selection"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Vælg relationsmedlemmer der refererer til primitiver i den nuværende "
-#~ "markering"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Vælg relationsmedlemmer der refererer til {0} primitiver i den nuværende "
-#~ "markering"
-
-#~ msgid "change the selection"
-#~ msgstr "ændr markeringen"
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Du skal vælge mindst 2 veje."
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Åbn"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Kan ikke duplikere uordnet vej"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Angiv et menunavn og en WMS URL"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relationer skaber en cyklus, fordi de refererer til hinanden."
-#~ "<br>JOSM kan ikke uploade dem. Redigér venligst relationerne og fjern den "
-#~ "cirkulære afhængighed.</html>"
-
-#~ msgid "Icon paths"
-#~ msgstr "Ikonstier"
-
-#~ msgid "<multiple>"
-#~ msgstr "<flere>"
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "Ingen primitiv med ID {0} i det lokale datasæt. Kan ikke udlede "
-#~ "primitivtypen."
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>Der blev anmodet om indlæsning af udvidelsen {0}.<br>Denne "
-#~ "udvidelse bliver ikke længere udviklet på og vil sandsynligvis medføre "
-#~ "fejl.<br>Den bør slås fra.<br>Slet fra indstillinger?</html>"
-
-#~ msgid "Plugin {0} is no longer necessary and has been deactivated."
-#~ msgstr "Udvidelsen {0} er ikke længere nødvendig og er blevet deaktiveret."
-
-#~ msgid "Delete old plugin file {0}"
-#~ msgstr "Slet gammel udvidelsesfil {0}"
-
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Slet gammel udvidelse {0}"
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
-#~ msgstr ""
-#~ "Du opdaterede din JOSM-software.\n"
-#~ "For at forebygge problemer bør udvidelserne også opdateres.\n"
-#~ "Opdatér udvidelser nu?"
-
-#~ msgid ""
-#~ "<html><p>You've encountered an error in JOSM. Before you file a "
-#~ "bug<br>make sure you've updated to the latest version of JOSM here:</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Du er stødt på en fejl i JOSM. Før du rapporterer en bug<br>vær "
-#~ "da sikker på at du har opdateret til den seneste version af JOSM her:</"
-#~ "p></html>"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Udvidelsen kunne ikke fjernes. Den er sandsynligvis allerede slået fra"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Fjernstyringsmodulet vil altid lytte på port 8111 på localhost. Porten "
-#~ "kan ikke ændres fordi den henvises til af eksterne applikationer der "
-#~ "snakker til modulet."
-
-#~ msgid "autoload tiles"
-#~ msgstr "auto-indlæs tern"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Indstillinger for SlippyMap-modulet"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Markér en enkelt, lukket vej med mindst 4 punkter"
-
-#~ msgid ""
-#~ "<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-#~ "username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Godkendelse ved OSM API ''{0}'' fejlede. Indtast venligst et "
-#~ "gyldigt brugernavn og en gyldig adgangskode.</html>"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} konflikt er blevet <strong>løst automatisk</strong> ved udrensning af "
-#~ "{0} objekt<br>fra det lokale datasæt fordi det er slettet på serveren."
-#~ msgstr[1] ""
-#~ "{0} konflikter er blevet <strong>løst automatisk</strong> ved udrensning "
-#~ "af {0} objekter<br>fra det lokale datasæt fordi de er slettet på serveren."
-
-#~ msgid ""
-#~ "<html>Could not retrieve the list of your open changesets because<br>JOSM "
-#~ "doesn't know your identity.<br>You've either chosen to work anonymously "
-#~ "or you are not entitled<br>to know the identity of the user on whose "
-#~ "behalf you are working.</html>"
-#~ msgstr ""
-#~ "<html>Kunne ikke hente listen med dine åbne rettesæt, fordi<br>JOSM ikke "
-#~ "kender din identitet.<br>Du har enten valgt at arbejde anonymt eller du "
-#~ "har ikke tilladelse<br>til at kende identiteten af den bruger på hvis "
-#~ "vegne du arbejder.</html>"
-
-#~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-#~ msgstr ""
-#~ "Advarsel: Kunne ikke hente brugerinfo for den nuværende JOSM bruger. "
-#~ "Undtagelse var: {0}"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Upload <strong>fejlede</strong> fordi du har brugt<br>rettesæt {0}, "
-#~ "som allerede blev lukket {1}.<br>Upload venligst igen med et nyt eller et "
-#~ "eksisterende åbent rettesæt.</html>"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} konflikt mangler endnu at blive løst.<br><br>Åbn venligst "
-#~ "konfliktlistedialogen og løs den manuelt."
-#~ msgstr[1] ""
-#~ "{0} konflikter mangler endnu at blive løst.<br><br>Åbn venligst "
-#~ "konfliktlistedialogen og løs dem manuelt."
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-#~ msgstr "<html>Afstemte <b>{0}</b> af <b>{1}</b> fotos med GPX-spor.</html>"
-
-#~ msgid "Close the prefereces dialog and discard preference updates"
-#~ msgstr "Luk indstillingsdialogen og kasser ændringer af indstillinger"
-
-#~ msgid ""
-#~ "<html>The OSM API server at ''{0}'' didn''t return a valid response."
-#~ "<br>It is likely that ''{0}'' isn''t an OSM API server.<br>Please check "
-#~ "the spelling of ''{0}'' and validate again.</html>"
-#~ msgstr ""
-#~ "<html>OSM API serveren på ''{0}'' meldte ikke tilbage med et gyldigt svar."
-#~ "<br>Det er sandsynligt at \"{0}\" ikke er en OSM API server."
-#~ "<br>Kontroller venligst stavemåden af \"{0}\" og validér igen.</html>"
-
-#~ msgid "The current value isn't a valid URL"
-#~ msgstr "Den nuværende værdi er ikke en gyldig URL"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Hverken <strong>{0}</strong> eller <strong>{1}</strong> er slået "
-#~ "til.<br>Vælg venligst enten at downloade OSM-data, GPX-data eller begge "
-#~ "dele.</html>"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Slå indbyggede standarder til"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Opdatér udvidelser"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Aktivering af de opdaterede udvidelser fejlede. Tjek om JOSM har "
-#~ "tilladelse til at overskrive de eksisterende udvidelser."
-
-#~ msgid ""
-#~ "You have encountered an error in JOSM. Before you file a bug reportmake "
-#~ "sure you have updated to the latest version of JOSM here:"
-#~ msgstr ""
-#~ "Du er stødt på en fejl i JOSM. Før du rapporterer en bug, vær da sikker "
-#~ "på at du har opdateret til den seneste version af JOSM her:"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Udvidelsen {0} er ikke tilgængelig. Opdatering sprunget over."
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn''t know about an object<br>you tried to "
-#~ "read, update, or delete. Either the respective object<br>doesn''t exist "
-#~ "on the server or you''re using an invalid URL to access<br>it. Please "
-#~ "carefully check the servers address ''{0}'' for typos."
-#~ msgstr ""
-#~ "OSM-serveren \"{0}\" kender ikke til et objekt<br>du prøvede at læse, "
-#~ "opdatere eller slette. Enten eksisterer det respektive objekt<br>ikke på "
-#~ "serveren eller også bruger du en ugyldig URL til at tilgå<br>det. "
-#~ "Kontrollér venligst serverens adresse \"{0}\" omhyggeligt for stavefejl."
-
-#~ msgid ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-#~ msgstr ""
-#~ "Du bør også opdaterer dine udvidelser. Hvis intet af dette hjælper, "
-#~ "rapporter da venligst en bug i vores bugtracker ved hjælp af dette link:"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Kunne ikke åbne hjælp-side for URL {0}.<br>Dette skyldes "
-#~ "sandsynligvis et netværksproblem. Tjek venligst din<br> "
-#~ "internetforbindelse.</html>"
-
-#~ msgid "Used style"
-#~ msgstr "Anvendt stil"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Viser et glidende kortnet i JOSM. Kan hente tern fra glidende kort, som "
-#~ "baggrund og anmode om opdateringer."
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Der er ikke noget WMS-lag at justere i øjeblikket"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Den basale URL<br>''{0}''<br>for dette WMS-lag ender hverken med en "
-#~ "'&' eller med en'?'.<br>Dette fører sandsynligvis til en ugyldig WMS-"
-#~ "forespørgsel. Du bør kontrollere dine<br>indstillinger.<br>Ønsker du at "
-#~ "hente WMS-tern alligevel?"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Juster det markerede WMS-lags position"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Markér WMS-lag"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Markér venligst det WMS-lag, der skal justeres"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Redigér listen over WMS-servere, som vises i WMS-udvidelsesmenuen"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Vis georefererede billeder i JOSMs baggrund (WMS-servere, Yahoo, ...)."
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Advarsel: Den basale URL \"{0}\" for en WMS-service ender ikke med en '&' "
-#~ "eller en '?'."
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Forventede array med længden 4. Fik {0}"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Præcist fire doubles forventet i streng. Fik {0}."
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 påkrævet. Fik {0}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameteren ''{0}'' > 0 forventet. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "Parameter \"{0}\" i intervallet 0..{1} forventedes. Fik {2}"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "Parameteren \"{0}\" er ikke et gyldigt typenavn. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "Parameteren \"{0}\" er ikke en acceptabel klasse. Fik {1}."
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Uventet kolonne-indeks. Fik {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameteren 'col' skal være 0 eller 1. Fik {0}"
-
-#~ msgid ""
-#~ "Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
-#~ "capabilities. Got ''{2}"
-#~ msgstr ""
-#~ "Advarsel: Ulovlig værdi af attribut ''{0}'' af element ''{1}'' i "
-#~ "serverkapabilitet. Fik {2}."
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr "Ulovlig nummerisk værdi af attribut ''{0}''. Fik ''{1}''."
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Forventede instans af OsmDataLayer. Fik ''{0}''."
-
-#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Forventet værdi af type heltal > 0 for parameter ''{0}'', Fik {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "Parameter ''{0}'' >= 0 forventet. Fik ''{1}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "ID parameter ''{0}'' > 0 forventet. Fik ''{1}''."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "Indstilling med nøgle ''{0}'' giver ikke en heltalsværdi for ''{1}''. Fik "
-#~ "{2}. Kan ikke genskabe vinduesgeometri udfra indstillinger."
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Forventede værdi af type long > 0 for parameter ''{0}''. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Parameter ''{0}'' af type node forventet. Fik ''{1}''"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Forventet værdi > 0 for parameter ''{0}''. Fik {1}."
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr "Forventede unik ID > 0 for primitiv-ID. Fik {0}."
-
-#~ msgid "Man-Made"
-#~ msgstr "Menneskeskabt"
-
-#~ msgid ""
-#~ "<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
-#~ "validate again.</html>"
-#~ msgstr ""
-#~ "<html>''{0}'' er ikke en gyldig OSM API URL.<br>Kontrollér venligst "
-#~ "stavningen og validér igen.</html>"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "En OSM-datavalidator. Den tjekker for problemer i data og tilbyder "
-#~ "rettelser for de mest udbredte. Integreret stavekontrol for tag-navne."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Utaggede og ikkeforbundne punkter"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Denne test finder flersprogede objekter hvis ''name''-attribut ikke "
-#~ "svarer til nogen ''name:*''-attributter og ikke er en komposition af "
-#~ "''name:*''-attributter, f.eks. Italia - Italien - Italy"
-
-#~ msgid ""
-#~ "<html>Failed to retrieve information about the current userfrom the OSM "
-#~ "server ''{0}''.<br>This is probably not a problem caused by the tested "
-#~ "Access Token, but<br>rather a problem with the server configuration. "
-#~ "Carefully check the server<br>URL and your Internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Kunne ikke hente information om den nuværende bruger fra OSM-"
-#~ "serveren ''{0}''.<br>Dette er sandsynligvis ikke et problem forårsaget af "
-#~ "det testede adgangsudtryk, men<br>snarere et problem med server "
-#~ "konfigurationen. Kontrollér omhyggeligt server<br>URL'en og din "
-#~ "internetforbindelse.</html>"
-
-#~ msgid ""
-#~ "<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
-#~ "test to retrieve the user details for this token failed, though."
-#~ "<br>Depending on what rights are granted to this token you may "
-#~ "nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-#~ "other protected resources.</html>"
-#~ msgstr ""
-#~ "<html>Adgangsudtrykket ''{1}'' er kendt af  OSM serveren ''{0}''."
-#~ "<br>Testen til at hente dette udtryks brugerdetaljer\r\n"
-#~ " fejlede dog.<br>Afhængigt af hvilke rettigheder der er givet dette "
-#~ "udtryk må du ikke desto mindre bruge det<br>til at uploade data, uploade "
-#~ "GPS-spor, og/eller tilgå andre beskyttede resurser.</html>"
-
-#~ msgid ""
-#~ "<html>The test failed because the server responded with an internal error."
-#~ "<br>JOSM couldn''t decide whether the token is valid. Please try again "
-#~ "later.</html>"
-#~ msgstr ""
-#~ "<html>Testen fejlede fordi serveren meldte en intern fejl.<br>JOSM kunne "
-#~ "ikke afgøre om udtrykket er gyldigt. Prøv venligst igen senere.</html>"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Denne test tjekker at der ikke er nogen veje med samme tags og samme "
-#~ "punktkoordinater."
-
-#~ msgid ""
-#~ "<html>Run a fully automatic procedure to get an access token from the OSM "
-#~ "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-#~ "fully<br>automatically authorises the user and retrieves an Access Token."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Kør en fuldautomatisk procedure for at få et adgangsudtryk fra OSM-"
-#~ "websiden.<br>JOSM tilgår OSM-websiden på vegne af JOSM-brugeren og "
-#~ "autoriserer fuldt<br>automatisk brugeren og henter et adgangsudtryk.</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>Du har med succes hentet et OAuth adgangsudtryk fra OSM-websiden. "
-#~ "Klik på <strong>{0}</strong> for at acceptere udtrykket. JOSM vil bruge "
-#~ "det i fremtidige anmodninger for at få adgang til OSM API'et..</html>"
-
-#~ msgid ""
-#~ "<html><body>Please enter an OAuth Access Token which is authorised to "
-#~ "access the OSM server ''{0}''.</body></html>"
-#~ msgstr ""
-#~ "<html><body>Angiv venligst et OAuth adgangsudtryk, der er autoriseret til "
-#~ "at tilgå OSM-serveren ''{0}''.</body></html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed because JOSM wasn't able to build<br>a valid login "
-#~ "URL from the OAuth Authorise Endpoint URL ''{0}''.<br><br>Please check "
-#~ "your advanced setting and try again.</html>"
-#~ msgstr ""
-#~ "<html>Den automatiske proces for erhvervelse af et OAuth "
-#~ "adgangsudtryk<br>fra OSM-serveren fejlede fordi JOSM ikke var i stand til "
-#~ "at opbygge<br>et gyldigt loginURL udfra OAuth Authorise Endpoint URL "
-#~ "''{0}''.<br><br>Kontrollér venligst din avancerede indstilling og prøv "
-#~ "igen.</html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed.<br><br>Please try again or choose another kind of "
-#~ "authorisation process,<br>i.e. semi-automatic or manual authorisation.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Den automatiske proces for erhvervelse af et OAuth "
-#~ "adgangsudtryk<br>fra OSM-serveren fejlede.<br><br>Prøv venligst igen "
-#~ "eller vælg en anden slags autorisationsproces,<br>f.eks. halvautomatisk "
-#~ "eller manuel autorisation.</html>"
-
-#~ msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
-#~ msgstr "Autoriserer OAuth anmodningsudtrykket ''{0}'' på OSM-websiden ..."
-
-#~ msgid "Authorising request token ''{0}''..."
-#~ msgstr "Autoriserer anmodningsudtryk ''{0}''..."
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkeliste fra "
-#~ "server"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "The user name can't be empty. Please enter your OSM user name"
-#~ msgstr "Brugernavnet kan ikke være tomt. Angiv venligst dit OSM-brugernavn"
-
-#~ msgid "Authorise now"
-#~ msgstr "Autorisér nu"
-
-#~ msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-#~ msgstr "OSM-webside leverede ikke en sessionscookie som svar på ''{0}'',"
-
-#~ msgid "OAuth authorisation failed"
-#~ msgstr "OAuth autorisation fejlede"
-
-#~ msgid "Authorise JOSM to access the OSM API"
-#~ msgstr "Autorisér JOSM til at få adgang til OSM API'et"
-
-#~ msgid "Please select an authorisation procedure: "
-#~ msgstr "Vælg venligst en autorisationsprocedure: "
-
-#~ msgid "The password can't be empty. Please enter your OSM password"
-#~ msgstr "Adgangskoden kan ikke være tom. Angiv venligst din OSM-adgangskode"
-
-#~ msgid "Close the dialog and cancel authorisation"
-#~ msgstr "Luk dialogen og annullér autorisationen"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "De kopierede data indeholder ufuldstændige primitiver. Ved indsætning "
-#~ "bliver de ufuldstændige primitiver fjernet. Ønsker du at indsætte dataene "
-#~ "uden de ufuldstændige primitiver?"
-
-#~ msgid ""
-#~ "Parameters --download, --downloadgps and --selection are processed in "
-#~ "this order."
-#~ msgstr ""
-#~ "Parametrene --download, --downloadgps og --selection bliver behandlet i "
-#~ "denne rækkefølge."
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Advarsel: Revisionsfilen '/REVISION' mangler."
-
-#~ msgid ""
-#~ "Can't merge because either of the participating primitives is new and the "
-#~ "other is not"
-#~ msgstr ""
-#~ "Kan ikke samle fordi den ene af de medvirkende primitiver er ny og den "
-#~ "anden ikke er ny"
-
-#~ msgid ""
-#~ "Can't restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Kan ikke begrænse rettesætsforespørgslen til et specifikt "
-#~ "afgrænsningsfel. Inputtet er ugyldigt."
-
-#~ msgid "Authorise URL:"
-#~ msgstr "Autorisér URL:"
-
-#~ msgid "Click to redirect you to the authorisation form on the JOSM web site"
-#~ msgstr "Klik for at komme til autorisationsformularen på JOSM-websiden"
-
-#~ msgid "Failed to authorise OAuth request  ''{0}''"
-#~ msgstr "Kunne ikke autorisere OAuth-forespørgsel ''{0}''"
-
-#~ msgid "Run the automatic authorisation steps again"
-#~ msgstr "Kør de automatiske autorisationstrin igen"
-
-#~ msgid ""
-#~ "<html>You updated your JOSM software.<br>To prevent problems the plugins "
-#~ "should be updated as well.<br><br>Update plugins now?</html>"
-#~ msgstr ""
-#~ "<html>Du opdaterede JOSM-softwaren.<br>For at undgå problemer, bør "
-#~ "udvidelserne også opdateres nu.<br><br>Opdatér udvidelser nu?</html>"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Advarsel: Ingen indstilling ''{0}'' fundet."
-
-#~ msgid ""
-#~ "Can't create a changeset query including both the query parameters 'uid' "
-#~ "and 'display_name'"
-#~ msgstr ""
-#~ "Kan ikke lave en rettesætsforespørgsel der indeholder begge parametrene "
-#~ "'uid' og 'displayname'."
-
-#~ msgid ""
-#~ "Warning: JOSM is configured to use proxies from the system setting, but "
-#~ "the JVM is not configured to retrieve them. Resetting preferences to 'No "
-#~ "proxy'"
-#~ msgstr ""
-#~ "Advarsel: JOSM er konfigureret til at bruge proxyer fra "
-#~ "systemindstillingerne, men JVM'en er ikke konfigureret til at hente dem. "
-#~ "Nulstiller indstillinger til 'Ingen proxy'."
-
-#~ msgid ""
-#~ "Illegal document structure. Found node, way, or relation outside of "
-#~ "'create', 'modify', or 'delete'."
-#~ msgstr ""
-#~ "Ulovlig dokumentstruktur. Fandt punkt, vej eller relation udenfor "
-#~ "'create', 'modify', eller 'delete'."
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" er ikke lukket og kan derfor ikke forenes."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Lag ''{0}'' har allerede en konflikt for primitiv<br>''{1}''."
-#~ "<br>Denne konflikt kan ikke tilføjes.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Advarsel: Lag ''{0}'' eksisterer ikke længere. Kan ikke fjerne konflikt "
-#~ "for primitiv ''{1}''."
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Målobjekt med id {0} og version {1} er synlig selvom kildeobjekt med "
-#~ "lavere version {2} ikke er synlig. Kan ikke håndtere denne inkonsistens. "
-#~ "Beholder målobjekt. "
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Børnerelationen<br>{0}<br>er slettet fra serveren. Den kan ikke "
-#~ "hentes."
-
-#~ msgid ""
-#~ "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>Du har med succes hentet et OAuth adgangsudtryk fra OSM-websiden. "
-#~ "Klik på <strong>{0}</strong> for at acceptere udtrykket. JOSM vil bruge "
-#~ "det i fremtidige anmodninger for at få adgang til OSM API'et..</html>"
-
-#~ msgid "Download Object"
-#~ msgstr "Download objekt"
-
-#~ msgid "Download Object..."
-#~ msgstr "Download objekt..."
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Ugyldigt ID. Kan ikke downloade objekt."
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr "Det ser ud som om, JOSM brød ned sidste gang. Vil du genskabe data?"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Indtast dit OSM-brugernavn og -kodeord. Kodeordet bliver <strong>ikke</"
-#~ "strong> gemt i klartekst i JOSM-indstillingerne, og det vil <strong>kun</"
-#~ "strong> blive sendt til OSM-serveren én gang. Efterfølgende "
-#~ "dataforespørgsler vil ikke længere benytte dit kodeord."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Kunne ikke matcher det indtastede link eller id til den valgte tjeneste. "
-#~ "Prøv venligst igen."
+#~ msgid "Always update withouth asking"
+#~ msgstr "Opdater uden at spørge"
+
+#~ msgid "Both"
+#~ msgstr "Begge"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Mistænkelig data er fundet. Upload alligevel?"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 26529)
+++ applications/editors/josm/i18n/po/de.po	(revision 26530)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-31 10:08+0000\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-11 13:50+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:48+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:43+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Hilfe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoriere die ungültige Datei-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Warnung"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Der Parameter \"downloadgps\" unterstützt keine Dateinamen oder URLs."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "Kompatible) Version des JOSM nutzen.</li></ul>Weitere Informationen:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "JOSM Verlassen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Fortfahren, trotzdem versuchen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -389,6 +390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -415,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -421,7 +422,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -429,5 +431,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -640,5 +642,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -890,5 +892,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -897,5 +899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1084,6 +1086,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1236,5 +1238,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1471,6 +1473,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2148,5 +2150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2472,7 +2474,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Daten herunterladen"
@@ -2730,8 +2732,8 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die "
-"Fehlermeldung war: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
+"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. "
+"Fehlermeldung: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2870,10 +2872,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3048,5 +3050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3339,6 +3341,6 @@
 "(areasize:MIN-MAX or areasize:MAX)"
 msgstr ""
-"<b>Flächengröße:</b>... - geschlossene Wege mit einer Fläche zwischen MIN "
-"und MAX m². (Flächengröße:MIN-MAX oder Flächengröße:MAX)"
+"<b>areasize:</b>... - geschlossene Wege mit einer Fläche zwischen MIN und "
+"MAX m². (Flächengröße:MIN-MAX oder Flächengröße:MAX)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
@@ -3361,5 +3363,5 @@
 msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
 msgstr ""
-"<b>geschlossen</b> - alle geschlossenen Wege (ein Knotenpunkt gilt nicht als "
+"<b>closed</b> - alle geschlossenen Wege (ein Knotenpunkt gilt nicht als "
 "geschlossen)"
 
@@ -3668,5 +3670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr "Verdächtige Daten gefunden. Trotzdem hochladen?"
 
@@ -3717,40 +3719,40 @@
 msgstr "Punkt von {0} geändert"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "\"{0}\" vom Punkt \"{1}\" entfernen"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "\"{0}\" von Linie \"{1}\" entfernen"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "\"{0}\" aus Relation \"{1}\" entfernen"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "{0}={1} für Punkt \"{2}\" setzen"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "{0}={1} für Linie \"{2}\" setzen"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "{0}={1} für Relation \"{2}\" setzen"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "\"{0}\" entfernen für {1} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3881,4 +3883,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Löschbestätigung"
@@ -4202,6 +4205,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 "Warnung: Initialisierung der Einstellungen fehlgeschlagen. Einstellungsdatei "
@@ -4241,7 +4244,7 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Warnung: unerwartete Versionsnummer für JOSM in der Versions-Datei, der Wert "
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
+"Warnung: Unerwartete Versionsnummer für JOSM in der Versions-Datei, der Wert "
 "ist ''{0}''"
 
@@ -4351,10 +4354,10 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM erwartet das Objekt [{0} {1}] im Datensatz zu finden, aber es ist dort "
-"nicht vorhanden. Bitte melden Sie dies unter http://josm.openstreetmap.de. "
-"Es handelt sich nicht um einen kritischen Fehler. Sie sollten die Arbeit mit "
+"JOSM erwartet das Objekt [{0} {1}] im Datensatz zu finden, aber es ist nicht "
+"vorhanden. Bitte melden Sie dies unter http://josm.openstreetmap.de/. Es "
+"handelt sich nicht um einen kritischen Fehler. Sie sollten die Arbeit mit "
 "JOSM fortsetzen können."
 
@@ -4468,5 +4471,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4485,8 +4488,8 @@
 msgstr "Multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4640,52 +4643,68 @@
 msgstr "WGS84 Geografisch"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+"Fehler: Öffnen des Eingabedatenstroms für Ressource ''/data/{0}'' "
+"fehlgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr "Gauß-Krüger"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr "GK-Zone"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Warnung: Fehler beim Öffnen der Ressource ''/data/{0}''. Kann das NTF<-"
-">RFG93-Gitter nicht laden."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+"Fehler: Öffnen des Eingabedatenstroms für Ressource ''/data/{0}'' "
+"fehlgeschlagen. Kann NTF<->RGF93-Raster nicht laden."
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "4 Lambert-Zonen (Frankreich)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} bis {2} Grad)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Korsika)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert-CC-Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert-CC9-Zone (Frankreich)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-Zone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Merkator"
@@ -4714,81 +4733,101 @@
 "können nicht passend zu Code ''{1}'' gesetzt werden."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG-Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG-2000-Zone {0} (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swissgrid (Schweiz)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Latvia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Nord"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Süd"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Hemisphäre"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Offset 3''000''000m Ost"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Réunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM-Frankreich (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "Geodätisches System UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr "GRS80"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr "WGS84"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr "Lambert-Konforme Kegelprojektion"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr "Schweizer schiefachsige Mercator"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr "Transversal Mercator"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -5013,45 +5052,45 @@
 msgstr "Dieser Test prüft, ob Multipolygone gültig sind"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Linie mit Flächenzeichenstil nicht geschlossen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Keine äußere Linie für Multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Kein Zeichenstil für das Multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Kein Zeichenstil in Multipolygonrelation"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Zeichenstil für innere Linie mit Multipolygon identisch"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Zeichenstil für äußere Linie unterschiedlich"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygon nicht geschlossen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Innenlinie im Multipolygon ist außen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Multipolygonlinien schneiden sich"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Keine sinnvolle Rolle für Multipolygon-Element"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Nicht-Linie im Multipolygon"
@@ -5330,5 +5369,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5353,5 +5392,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5362,5 +5401,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5777,5 +5816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5845,5 +5884,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "Straße"
@@ -5851,5 +5890,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5857,10 +5896,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "Gewässer"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "Landfläche"
@@ -5870,5 +5909,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5882,5 +5921,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5893,5 +5932,5 @@
 msgstr "Öffentliche Verkehrsmittel"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6263,5 +6302,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6372,4 +6411,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6476,5 +6516,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6522,5 +6562,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6818,6 +6858,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 "Liste der vereinigten Elemente. Die Liste mit meinen Elementen wird "
@@ -7068,9 +7108,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr "Behalte meine Koordinaten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr "Server-Koordinaten behalten"
 
@@ -7129,6 +7169,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7150,6 +7190,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7568,5 +7608,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7812,5 +7852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -8038,6 +8078,36 @@
 msgstr "MapCSS"
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
 msgstr "unbekannt"
 
@@ -8321,5 +8391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8339,5 +8409,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8354,5 +8424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Unvollständige Elemente der ausgewählten Relationen herunterladen"
@@ -8360,5 +8430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Unvollständige Elemente herunterladen"
@@ -8401,5 +8471,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8407,5 +8477,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8609,5 +8679,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8711,5 +8781,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Nutzer"
@@ -9707,5 +9776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9887,5 +9956,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -10040,4 +10109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Nur meine eigenen Änderungssätze"
@@ -10050,4 +10120,11 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Nur Änderungssätze vom Nutzer mit folgendem Namen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Nur meine Änderungssätze (deaktiviert. JOSM-Nutzer momentan noch anonym)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10347,9 +10424,9 @@
 msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10358,13 +10435,13 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10377,18 +10454,19 @@
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Werte ändern?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] "Wert ändern?"
+msgstr[1] "Werte ändern?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr "Schlüssel überschreiben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10399,5 +10477,5 @@
 "Der neue Schlüssel ist bereits in Benutzung, Werte überschreiben?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10407,5 +10485,5 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10414,27 +10492,31 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr "Wert hinzufügen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10443,62 +10525,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Position"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Zur OSM-Wiki für Hilfe zu Merkmalen gehen (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Browser mit Wikihilfe zum ausgewählten Objekt starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Relation in Hauptauswahl übernehmen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Elemente der ausgewählten Relation auswählen"
@@ -10564,10 +10646,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Warnung: Ignoriere Fehler, da die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10589,5 +10673,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] "Lade {0} unvollständiges Element von {1} Elternrelationen"
 msgstr[1] "Lade {0} unvollständige Elemente von {1} Elternrelationen"
@@ -10958,10 +11042,4 @@
 msgstr "Es traten {0} Konflikte während des Imports auf."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -11002,12 +11080,4 @@
 msgid "Load relation"
 msgstr "Relation laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Warnung: Ignoriere Fehlermedlung, da der zugrundeliegende Vorgang "
-"abgebrochen wurde. Die Fehlermeldung lautete: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11293,37 +11363,4 @@
 msgstr "Typ"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "unbekannt"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11456,20 +11493,20 @@
 msgstr "Koordinaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Versionsprotokoll für Punkt {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Versionsprotokoll für Linie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Versionsprotokoll für Relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Versionsprotokoll erneut vom Server laden"
@@ -11569,6 +11606,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Änderungssatz"
+msgid "Changeset:"
+msgstr "Änderungssatz:"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12181,8 +12218,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 "<html>Speichern und/oder Hochladen einer Ebene mit veränderten "
@@ -12637,4 +12674,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12665,13 +12703,4 @@
 "<html>{0} Objekte können nicht in einer Anfrage hochladen, da die<br>max. "
 "Änderungssatz-Größe {1} auf dem Server ''{2}'' überschritten wird.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Es sind <strong>mehrere Änderungssätze</strong> notwendig, um {0} "
-"Objekte hochzuladen. Welche Vorgehensweise wollen Sie benutzen?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12749,38 +12778,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Voreinstellung"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Beschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12791,9 +12820,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12801,26 +12830,26 @@
 msgstr "Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Zeitraum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Länge: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12829,8 +12858,8 @@
 msgstr[1] "{0} Routen, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12839,12 +12868,12 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12853,10 +12882,10 @@
 msgstr[1] "{0} GPS-Spuren, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12866,78 +12895,78 @@
 "<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Herunterladen nahe bei:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "Nur GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "Nur Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "GPS-Spur und Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12948,6 +12977,6 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -12955,6 +12984,6 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12964,6 +12993,6 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12973,27 +13002,27 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr "Spur-Anzeige anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Marken von benannten Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benannte GPS-Punkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Audio importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -13006,29 +13035,29 @@
 "Audiodaten verknüpft werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import nicht möglich"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -13139,5 +13168,5 @@
 msgstr "Folgende Probleme gefunden:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13150,57 +13179,65 @@
 "Bitte Projektion ändern oder die Ebene entfernen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Autom. Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Kacheln automatisch laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr "Zeige Fehler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Kachel laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Kachelinformationen anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Alle Kacheln laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr "Alle Fehlerkacheln laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Zoom erhöhen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Zoom reduzieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "An Kachelgröße anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Kachel-Zwischenspeicher leeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "Zum Laden von Kacheln hereinzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "Zum Laden weiterer Kacheln hereinzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "Zoomstufe erhöhen, um mehr Details zu sehen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "Keine Kacheln auf dieser Zoomstufe"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr "EPSG:4326 und Mercator-Projektion werden unterstützt"
@@ -13756,10 +13793,10 @@
 msgstr "JPEG-Bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "GPS-Markierung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13767,5 +13804,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13774,5 +13811,5 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -13780,17 +13817,17 @@
 "Offset abgeleitet werden könnte."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Zeige Text/Symbole"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Ton synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13799,5 +13836,5 @@
 "Synchronisationston hören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13805,14 +13842,14 @@
 msgstr "Ton synchronisiert bei Punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Sychronisation in Abspielebene nicht möglich."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Audio-Marke an der aktuellen Abspielposition einfügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13842,13 +13879,13 @@
 msgstr "Konnte Audio-Marke nicht synchronisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Fehler beim Anzeigen der URL für diesen Wegpunkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(Die URL lautet: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Fehler beim Anzeigen der URL"
@@ -14915,53 +14952,53 @@
 msgstr "Farben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Richtungspfeile zeichnen"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Nur am Ende der Linie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Einbahnstraßenpfeile zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Ordnungsnummer des Abschnitts anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuelle Punkte im Auswahlmodus zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Nur Außenlinie von Flächen zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Richtungspfeile für Linienabschnitte zeichnen."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
@@ -14970,10 +15007,10 @@
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Ordnungsnummer für alle Abschnitte innerhalb der Linie anzeigen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14982,10 +15019,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14994,9 +15031,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -15006,15 +15043,51 @@
 "anderen im ausgewählten Stil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automatisch"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Name"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Beschreibung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr "Alles"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr "Name oder Offset"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Keine"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Globale Einstellungen verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -15025,48 +15098,40 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Lokale Dateien"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Keine"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Linien erzwingen, wenn keine Abschnitte importiert wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Große GPS-Punkte zeichnen."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Kreisförmig die Genauigkeit des GPS-Signals (HDOP) anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Geschwindigkeit (rot = langsam, grün = schnell)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr "Richtung (Rot = West, Gelb = Nord, Grün = Ost, Blau = Süd)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Positionsverschlechterung (rot = hoch, grün = niedrig; nur wenn verfügbar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr "Datum der Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -15074,5 +15139,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -15096,5 +15161,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15137,5 +15202,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15149,38 +15214,18 @@
 msgstr "Zu Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Marken beim Einlesen von GPX erstellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Schnelles Zeichnen (schlechtere Qualität)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr "Dynamischer Farbbereich basierend auf den Datengrenzwerten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automatisch"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Name"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Beschreibung"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Beide"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15191,10 +15236,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15204,10 +15249,10 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15216,10 +15261,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15228,10 +15273,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15240,5 +15285,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15247,14 +15292,14 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15264,13 +15309,13 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr "Färbt Punkte und Wegabschnitte anhand der Fahrtrichtung."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15280,10 +15325,10 @@
 "Ihr GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr "Punkte und Wegabschnitte anhand des Zeitstempels färben."
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -15291,20 +15336,38 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 "Färbung der Punkte und Wegabschnitte mittels der Datengrenzwerte anpassen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Wegpunkt-Beschriftung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
-msgstr "Globale Einstellungen"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr "Audio-Wegpunkt-Bezeichnung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr "Ungültiges Muster für Wegpunktbezeichnung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr "Ungültiges Muster"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
+msgstr "Ungültiges Muster für Audio-Wegpunkt-Bezeichnung: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16010,5 +16073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -16102,5 +16165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -16401,5 +16464,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr "Immer ohne Nachfrage aktualisieren"
 
@@ -16834,5 +16897,5 @@
 msgstr "Neue Relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16861,9 +16924,9 @@
 msgstr "Vorlagen suchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Nur Einträge passend zur Auswahl zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Suche in Merkmalen"
@@ -17173,8 +17236,8 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Es trat ein Fehler beim Einlesen der GPX-Datei \"{0}\" auf. Datei wird nur "
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
+"Es trat ein Fehler beim Einlesen der GPX-Datei ''{0}'' auf. Datei wird nur "
 "teilweise verwendet."
 
@@ -17522,5 +17585,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 "Vorspann des OsmChange-Dokuments noch nicht geschrieben. Bitte zuerst "
@@ -17757,5 +17820,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -18172,4 +18235,11 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+"Warnung: Typ der Hintergrundquelle konnte nicht erkannt werden. Standard "
+"(XML) wird genutzt."
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -19115,4 +19185,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -19254,4 +19326,18 @@
 msgstr "Laden des XML-Schemas fehlgeschlagen."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr "Unerwartete Kennung ({0}) auf Position {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr "Unerwartete Kennung auf Position{0}. Erwartet {1}, erhalten {2}"
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr "Fehler beim Analysieren des Suchausdrucks"
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19321,5 +19407,5 @@
 msgctxt "landuse"
 msgid "farmland"
-msgstr "Farmland"
+msgstr "Ackerland"
 
 #. Landuse type used in multipolygons
@@ -19846,5 +19932,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr "Filtert nicht benötigte GPS-Spuren"
 
@@ -35594,5 +35680,5 @@
 #: build/trans_style.java:2760
 msgid "farmyard"
-msgstr "Farmland"
+msgstr "Bauernhof"
 
 #. <icon src="misc/no_icon.png"/>
@@ -36228,4 +36314,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -36242,6 +36329,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -36260,15 +36347,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "Abgekürzter Straßenname"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "Einbahnstraße auf einem Punkt"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "Brückenmerkmal auf einem Punkt"
@@ -36279,12 +36366,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "Falsches Straßenmerkmal auf einem Punkt"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Unbenannte klassenlose Straße"
@@ -36293,16 +36380,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "Straße ohne Referenznummer"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "Temporärer Straßentyp"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "Falschgeschriebener Schlüssel: name"
@@ -36312,10 +36399,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "Radweg mit bicycle-Merkmal"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "Fußweg mit foot-Merkmal"
@@ -36324,10 +36411,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "Radweg als Spur eines Radweges"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Barriere auf einen Weg"
@@ -36336,35 +36423,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "Höchstgeschwindigkeit auf einem Fußweg"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr "Einbahnstraße kombiniert mit *:backward/forward"
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "Ebenenschlüssel mit + Symbol"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "Straßenname enthält ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "Relation ohne Typ"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "Restaurant ohne Namen"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr "Ungewöhnliche Merkmalskombinationen (Straße und Wasser)"
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "Ungewöhnliche Schlüssel/Wert-Kombinationen"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr "Ungewöhnliche Merkmalskombinationen (Straße und Natur)"
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36469,118 +36565,128 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr "Geoimage.at (HighRes)"
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "MSR Maps Topo"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "MSR Maps Urban"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Tschechien CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Tschechien UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-Karten"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE-Karten (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7. Serie (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi (Lauden) - Italien"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sizilien - Italien"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italy"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Frankreich)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA-Spanien"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estland Basiskarte (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estland Luftbild (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Estland Multi (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Dänemark)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Dänemark)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Pangasinán (Phillipinen HiRes)"
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
+msgstr ""
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
@@ -36830,5 +36936,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr "Hochladen abgebrochen"
 
@@ -36932,9 +37038,9 @@
 msgstr "(Keine Höhendaten)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr "Einstellungen können nicht gespeichert werden"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr "FastDraw-Einstellungen"
@@ -36952,26 +37058,55 @@
 msgstr "Maximale Punktzahl je 1 Kilometer"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr "<RETURN>-Tasten-Modus"
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr "Autovereinfachen"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr "Mit Anfangs-Epsilon vereinfachen"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr "So speichern"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr "Punktfang"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr "Gesetzte Punkte mittels Klick hinzufügen"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr "Gesetzte Punkte mittels Leertaste hinzufügen"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr "FastDraw-Einstellungen"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr "Einstellungen speichern"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr "Einstellungen können nicht gelesen werden"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-"Drücken Sie die Eingabetaste für eine vereinfachte Darstellung oder zum "
-"Speichern, Strg+Eingabetaste zum Speichern mit Schlagwörtern, Hoch/Runter "
-"zum Justieren der vereinfachten Darstellung."
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+"Q=Optionen, RETURN=Speichern, Strg-RETURN=Mit Merkmalen speichern, Hoch/"
+"Runter=Feineinstellung"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36982,26 +37117,54 @@
 "Vereinfachen der Darstellung, Strg+Umschalttaste für eine neue Zeile"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr "Schnellzeichen"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr "Schnellzeichenmodus"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr "Zum Zeichnen einer neuen Linie die Maus bewegen"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr "Soll wirklich die Linie mit nur {0} Punkten gespeichert werden?"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Plugin-Information"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr "Kann Punkt nicht außerhalb des heruntergeladenen Bereiches plazieren."
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr "Linie mit Maus zeichnen"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, fuzzy, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr "min. Abstand={0} Pixel oder {1} m"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr "Linie in Schnellzeichenlinie umwandeln"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -37009,5 +37172,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr "Adressen korrigieren"
 
@@ -37118,9 +37281,9 @@
 msgstr "Unvollständige Adressen anzeigen"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "Elemente"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "keine Einträge"
@@ -37223,17 +37386,34 @@
 msgstr "Alle Adressen mit fehlenden Daten auswählen."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr "Standard-Bildprojektion"
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr "Aktuelle JOSM-Projektion"
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Ebenen-Eigenschaften"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Bild importieren"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Importiere georeferenziertes Bild"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Fehler beim Erstellen der Bildebene: "
@@ -37962,17 +38142,17 @@
 msgstr "Wähle eine Kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
 msgstr ""
 "Das Plugin cadastre-fr nutzte bisher das Tastaturkürzel <F11> zum Bilder "
@@ -37981,13 +38161,20 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM wird zum Aktivieren der Änderung beendet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -38115,6 +38302,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 "Original weißen Hintergrund durch die in den JOSM Einstellungen definierte "
@@ -39055,5 +39242,5 @@
 msgstr "EGPX-Ebene hinzufügen"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -39063,17 +39250,17 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Linienaussehen wählen"
@@ -39227,5 +39414,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr "Es wurde kein Regelsatz ausgewählt!"
@@ -39233,10 +39420,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr "Kein Regelsatz"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -39247,5 +39434,5 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -39256,6 +39443,6 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -39266,9 +39453,9 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr "Datei nicht gefunden:\n"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -39430,9 +39617,9 @@
 msgstr "Graphen erstellen/aktualisieren"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr "Graphenanzeige"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
@@ -39440,63 +39627,71 @@
 "visualisiert."
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr "Regelsatz"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr "Eingebaute Regelsätze verwenden"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr "Wxternal Regelsatzverzeichnis:"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr "Verzeichnis externer Regelsätze:"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr "Verzeichnis auswählen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr "Fahrzeug"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Erzeugen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr "Standardeinstellungen wiederherstellen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr "Visualisierung"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr "Richtungen getrennt zeichnen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr "Knotenpunktfarbe"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr "Pfeilfarbe"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr "Pfeilspitzen-Farbe"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr "Pfeilspitzen-Platzierung"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr "Neues Lesezeichen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr "\"{0}\" wirklich löschen?"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr "Lesezeichenlöschung"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39506,33 +39701,27 @@
 "Alle manuell hinzugefügten oder bearbeiteten Lesezeichen gehen verloren!"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr "Lesezeichen zurücksetzen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr "Knotenpunktfarbe auswählen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr "Pfeilfarbe auswählen"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr "Füllfarbe für Pfeilspitzen auswählen"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr "Vom Graphenanzeige-Plugin berechneter Routinggraph"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
 msgstr "Graphenanzeigeebene kann nicht vereinigt werden"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr "Graphenanzeige-Standardpunkt"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
-msgstr "Graphenanzeige-Standardabschnitt"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:35
@@ -39575,9 +39764,9 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
-msgstr ""
-"Oberflächenwerte dürfen folgende Zeichen nicht enthalten: '','', ''{'', "
-"''}'', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
+msgstr ""
+"Oberflächenwerte dürfen folgende Zeichen nicht enthalten: '','', '' '{' '', "
+"'' '}' '', ''='', ''|''"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:38
@@ -39707,30 +39896,43 @@
 msgstr "Importieren…"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr "Informationsmodus"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr "GPX-Informationsmodus"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
 msgid "Hide this"
 msgstr "Ausblenden"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
 msgid "Hide this&older"
 msgstr "Dies und älteres ausblenden"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr "Kein Zeitstempel"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr "km/h"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr "Spur-Name: "
@@ -40445,5 +40647,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -40464,5 +40666,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 "Zur Passwortverwaltung transferieren und aus Einstellungsdatei entfernen"
@@ -41213,17 +41415,17 @@
 msgstr "Neue Bildebene aus der Zwischenablage"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Unterstützte Bildformate"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Neue Bildebene aus einer Datei..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Kartenobjekt wurde nicht gefunden."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer konnte Bild nicht laden oder importieren."
@@ -41237,41 +41439,35 @@
 msgstr "Die Zwischenablage enthält kein Bild"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "Es wurde eine passende Kalibrierungsdatei gefunden:"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(setze \"{0}\" to ja/nein/fragen in den Einstellungen, um das\n"
-"automatische Laden der Kalibrierparameter zu kontrollieren)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr "Eine zum Bild passende Kalibrierungsdatei wurde gefunden: {0}\n"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+"Setze ''{0}'' auf yes/no/ask (ja/nein/fragen) in den Einstellungen für das "
+"automatische Laden von Kalibrierungsdateien."
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "Möchten sie dies anwenden?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "Kalibrierungsdatei laden?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Es wird automatisch übernommen."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr "In Zukunft werden Kalibrierungsdateien automatisch geladen."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Setze \"{0}\" auf ja/nein/fragen in den Einstellungen für das automatische "
-"Laden von Kalibrierungsdateien."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -41901,7 +42097,6 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
-msgstr ""
-"Referrer der ausgewählten Relation mitsamt deren Mitglieder herunterladen"
+msgid "Download referrers for the chosen relation and its members."
+msgstr "Verweise der gewählten Relation und deren Elemente herunterladen."
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
@@ -42274,5 +42469,5 @@
 #, java-format
 msgid "Error parsing {0}: {1}"
-msgstr "Fehler beim Parsen von {0}: {1}"
+msgstr "Fehler beim Analysieren von {0}: {1}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
@@ -42899,4 +43094,26 @@
 msgstr "Einen neuen Signaturschlüssel erstellen"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr "Keine solche Spur."
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+"<html>Die Anzahl der Spuren ist für ein oder mehrere Straßen nicht "
+"spezifiziert. Bitte fehlende ''lane''-Merkmale ergänzen.</html>"
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+"<html>Beim Erstellen des Modells ist ein Fehler aufgetreten. Bitte Validator "
+"starten, um sicherzustellen, dass die Daten konsistent sind.<br><br>Fehler: "
+"{0}</html>"
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -43130,6 +43347,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 "Diese Abbiegebeschränkung verweist auf ein Objekt, welches außerhalb dieses "
@@ -43395,6 +43612,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Editorfenster für die ausgewählten Abbiegeeinschränkungen öffnen"
+msgid "Open an editor for the selected turn restriction"
+msgstr "Editorfenster für die ausgewählte Abbiegeeinschränkung öffnen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -44041,5 +44258,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 "Angrenzende Linien werden ausgewählt. Punkte werden aus der Auswahl entfernt."
@@ -44453,4800 +44670,106 @@
 msgstr "Ein Rennauto auf dieser Ebene fahren"
 
-#~ msgid "Move"
-#~ msgstr "Verschieben"
-
-#~ msgid "No data imported."
-#~ msgstr "Keine Daten importiert."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Bitte geben Sie einen Namen für den Ort an."
-
-#~ msgid "File could not be found."
-#~ msgstr "Datei wurde nicht gefunden."
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Noch nicht implementiert."
-
-#~ msgid "Load Selection"
-#~ msgstr "Auswahl laden"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Dateiendung unbekannt."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Ausgewählte Ebene löschen."
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "Punkt"
-#~ msgstr[1] "Punkte"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} Punkt"
-#~ msgstr[1] "{0} Punkte"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Ungespeicherte Änderungen"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} gelöscht.)"
-
-#~ msgid "Enter Password"
-#~ msgstr "Passwort eingeben"
-
-#~ msgid "position"
-#~ msgstr "Position"
-
-#~ msgid "different"
-#~ msgstr "unterschiedlich"
-
-#~ msgid "true"
-#~ msgstr "wahr"
-
-#~ msgid "false"
-#~ msgstr "falsch"
-
-#~ msgid "layer not in list."
-#~ msgstr "Ebene nicht in der Liste."
-
-#~ msgid "to"
-#~ msgstr "bis"
-
-#~ msgid "Jump back."
-#~ msgstr "Springe zurück."
-
-#~ msgid "Faster Forward"
-#~ msgstr "Schneller abspielen"
-
-#~ msgid "Next Marker"
-#~ msgstr "Nächste Marke"
-
-#~ msgid "Play next marker."
-#~ msgstr "Die nächste Marke abspielen."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Vorherige Marke"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Die vorherige Marke abspielen."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Langsamer abspielen"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle Wege sind leer"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Bitte wählen Sie mindestens eine Aufgabe zum Herunterladen"
-
-#~ msgid "gps track description"
-#~ msgstr "Beschreibung der GPS-Spur"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Im Browser öffnen"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Einen Wegabschnitt bewegen, um ein Rechteck zu erstellen."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Objekte auswählen, verschieben, und drehen"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?"
-
-#~ msgid "Create a new map."
-#~ msgstr "Eine neue Karte erstellen."
+#~ msgid "Change values?"
+#~ msgstr "Werte ändern?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "Ungewöhnliche Schlüssel/Wert-Kombinationen"
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions "
-#~ "for no layer.\""
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Beim Speichern ist ein Fehler aufgetreten."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Bitte einen Suchbegriff eingeben."
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Fehlendes Argument für 'OR'."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Fehlendes Argument für 'NICHT'."
+#~ "Original weißen Hintergrund durch die in den JOSM Einstellungen "
+#~ "definierte Hintergrundfarbe ersetzen."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Hochladen abgebrochen"
 
 #~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege "
-#~ "kopiert.\n"
-#~ "Sie sollten dies überprüfen und falls nötig korrigieren."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Diese Änderungen hochladen?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konflikt mit Relation"
-
-#~ msgid "Split way segment"
-#~ msgstr "Wegabschnitt aufspalten"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "EntferneRelationsElement"
-
-#~ msgid "Rotate"
-#~ msgstr "Drehen"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Änderungen nicht anbringen"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert-Zone (Frankreich)"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} Objekt hat Konflikte:"
-#~ msgstr[1] "{0} Objekte haben Konflikte:"
-
-#~ msgid "my version:"
-#~ msgstr "meine Version:"
-
-#~ msgid "their version:"
-#~ msgstr "deren Version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "neue Version:"
+#~ "Liste der vereinigten Elemente. Die Liste mit meinen Elementen wird "
+#~ "hierdurch ersetzt, wenn die Änderungen bestätigt werden."
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Behalte meine Koordinaten"
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Alle ausgewählten Objekte in den Zustand zurücksetzen, der in der "
-#~ "Versionsliste ausgewählt ist."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Soll wirklich die gesamte Ebene gelöscht werden?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Ebene direkt unterhalb in die gewählte Ebene integrieren."
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Ein leerer Wert löscht den Schlüssel."
-
-#~ msgid "Create new relation"
-#~ msgstr "Neue Relation erstellen"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Neue Relation bearbeiten"
-
-#~ msgid "Occupied By"
-#~ msgstr "Belegt durch"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Mitglieder: {0}"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fehler beim Parsen der Serverantwort."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kann nicht mit Server verbinden."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Die Auswahlliste aktualisieren."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Datenquellen und Typen"
-
-#~ msgid "Download Area"
-#~ msgstr "Bereich laden"
-
-#~ msgid "zoom level"
-#~ msgstr "Zoomstufe"
-
-#~ msgid "x from"
-#~ msgstr "X von"
-
-#~ msgid "y from"
-#~ msgstr "Y von"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Bilder für {0}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS Ende: {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "Zeitzonen Unterschied: "
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "Bild"
-#~ msgstr[1] "Bilder"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} innerhalb der GPS-Spur."
-
-#~ msgid "Timespan: "
-#~ msgstr "Zeitspanne: "
-
-#~ msgid "Length: "
-#~ msgstr "Länge: "
-
-#~ msgid "name"
-#~ msgstr "Name"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "Eine GPS-Spur mit einem Punkt"
-#~ msgstr[1] "Eine GPS-Spur mit {0} Punkten"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} besteht aus {1} GPS-Spur"
-#~ msgstr[1] "{0} besteht aus {1} GPS-Spuren"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
-
-#~ msgid "File not found"
-#~ msgstr "Datei nicht gefunden"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
-
-#~ msgid "Download List"
-#~ msgstr "Liste laden"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alle installierten Plugins sind aktuell."
+#~ "Das Plugin cadastre-fr nutzte bisher das Tastaturkürzel <F11> zum Bilder "
+#~ "holen.\n"
+#~ "Dieses wird jetzt standardmäßig zur Vollbildumschaltung genutzt.\n"
+#~ "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
 #~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Folgende Plugins aktualisieren:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Version {1}{2}"
+#~ "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Die folgenden Plugins herunterladen?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonym"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxy-Einstellungen"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxyserver-Hostname"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxyserver-Port"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Proxyserver-Nutzername"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Proxyserver-Passwort"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Die Basis-URL des OSM Servers (REST API)"
-
-#~ msgid "Base Server URL"
-#~ msgstr "Server Basis-URL"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-Benutzername (E-Mail)"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Voreinstellungen laden"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Vorlagengruppe \"{0}\""
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Passwort oder Benutzername falsch."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> hat Null ref"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Illegales Objekt mit id=0"
-
-#~ msgid "Commit comment"
-#~ msgstr "Änderungskommentar"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Öffne Änderungssatz..."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin nicht gefunden: {0}."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Plugins aktualisieren"
+#~ "Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die "
+#~ "Fehlermeldung war: {0}"
 
 #~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Es gab Probleme mit den folgenden Plugins:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin erfolgreich aktualisiert. Bitte JOSM neu starten."
-#~ msgstr[1] "{0} Plugins erfolgreich aktualisiert. Bitte JOSM neu starten."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kann das Plugin {0} nicht von {1} laden"
-
-#~ msgid "Do not show again"
-#~ msgstr "Nicht noch einmal zeigen"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Georeferenzierte Bilder"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} wurden als GPS-markiert erkannt."
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Ich bin in der Zeitzone von: "
+#~ "Warnung: Initialisierung der Einstellungen fehlgeschlagen. "
+#~ "Einstellungsdatei konnte nicht auf Standardwerte zurückgesetzt werden: {0}"
 
 #~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "<html>Ich kann ein Bild meines GPS-Empfängers machen.<br>Ist das "
-#~ "hilfreich?</html>"
-
-#~ msgid "Update position for: "
-#~ msgstr "Position aktualisieren für: "
-
-#~ msgid "All images"
-#~ msgstr "Alle Bilder"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Bilder ohne EXIF-Position"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPS-Spur geladen"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Weg duplizieren"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Ausgewählte Wege duplizieren."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Weg duplizieren"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Gitterursprung"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Gitterdrehung"
-
-#~ msgid "World"
-#~ msgstr "Welt"
-
-#~ msgid "Grid layout"
-#~ msgstr "Rasterebene"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Raster Ebene:"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorboot"
-
-#~ msgid "Boat"
-#~ msgstr "Boot"
-
-#~ msgid "Bridleway"
-#~ msgstr "Reitweg"
-
-#~ msgid "Cycleway"
-#~ msgstr "Fahrradweg"
-
-#~ msgid "Footway"
-#~ msgstr "Fußweg"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Feldweg Grad 1 (asphaltiert)"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Feldweg Grad 2 (Schotter)"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Feldweg Grad 3 (befestigt)"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Feldweg Grad 4 (wenig befestigt)"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Feldweg Grad 5 (unbefestigt)"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Wanderweg bearbeiten"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Bergwanderweg"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Bergwanderweg bearbeiten"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Anspruchsvoller Bergwanderweg"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Anspruchsvollen Bergwanderweg bearbeiten"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Alpinen Wanderweg bearbeiten"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Gewässerpunkte"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Shop"
-#~ msgstr "Geschäft"
-
-#~ msgid "Edit Station"
-#~ msgstr "Bahnhof bearbeiten"
-
-#~ msgid "Accomodation"
-#~ msgstr "Unterkunft"
-
-#~ msgid "football"
-#~ msgstr "American Football"
-
-#~ msgid "rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motorsport"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Motorsportplatz bearbeiten"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
-#~ msgid "Edit Football"
-#~ msgstr "American Football-Platz bearbeiten"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Rugbyplatz bearbeiten"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarisch"
-
-#~ msgid "Amenities"
-#~ msgstr "Einrichtungen"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Bitte einen Suchbegriff eingeben"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kann die Ergebnisse der Ortssuche nicht vom Server laden"
-
-#~ msgid "zoom"
-#~ msgstr "Zoom"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "osmarender options"
-#~ msgstr "Einstellungen für Osmarender"
-
-#~ msgid "load data from API"
-#~ msgstr "Daten vom API herunterladen"
-
-#~ msgid "change the selection"
-#~ msgstr "Auswahl ändern"
-
-#~ msgid "change the viewport"
-#~ msgstr "Ansicht wechseln"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "Alle Fernsteueraktionen manuell bestätigen"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Erlaubte Aktionen"
-
-#~ msgid "Request Update"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "image not loaded"
-#~ msgstr "Bild nicht geladen"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Quellen der Kacheln"
-
-#~ msgid "error loading metadata"
-#~ msgstr "Fehler beim Laden der Metadaten"
-
-#~ msgid "requested: {0}"
-#~ msgstr "Angefordert: {0}"
-
-#~ msgid "start"
-#~ msgstr "Anfang"
-
-#~ msgid "end"
-#~ msgstr "Ende"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Ungültige Schlüssel/Wert-Kombinationen"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Die Daten enthalten Fehler. Trotzdem hochladen?"
-
-#~ msgid "help"
-#~ msgstr "Hilfe"
-
-#~ msgid "Help / About"
-#~ msgstr "Hilfe / Über"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta-Kartenkorrektur Bildnummer"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "Korrekturnummer={0}"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Die Position der WMS-Ebene anpassen"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Lade WMS-Ebene aus Datei {0}"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Liste der WMS-Server ändern, die im WMS Plugin-Menü angezeigt werden"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS-URL"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Bitte einen Bezeichner und einen WMS-URL eingeben"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Seite für allgemeine Einstellungen öffnen."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server unterstützt keine Gruppenänderungen"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin benötigt JOSM-Aktualisierung: {0}."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fehler beim Löschen des Plugins: {0}"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Danke für Ihr Verständnis</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grad Minuten Sekunden"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "W"
-
-#~ msgid "E"
-#~ msgstr "O"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Einige der Knoten sind (fast) in einer Linie"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Nur zwei Knoten erlaubt"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Auswahl darf nur aus Wegen bestehen."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Sie nutzen die EPSG:4326-Projektion. Diese kann beim "
-#~ "Erzeugen<br>von rechten Winkeln zu unerwarteten Resultaten führen."
-#~ "<br>Ändern Sie Ihre Projektion zum Ausschalten dieser Warnung.<br>Wollen "
-#~ "Sie fortfahren?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Nur ein Knoten ausgewählt"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Koordinaten des neuen Knotens eingeben."
-
-#~ msgid "Data Layer"
-#~ msgstr "Datenebene"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS-URL (Standard)"
-
-#~ msgid "Copy Default"
-#~ msgstr "Standard kopieren"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Fehler"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Zugbrücke"
-
-#~ msgid "park_and_ride"
-#~ msgstr "Park&Ride"
-
-#~ msgid "map"
-#~ msgstr "Karte"
-
-#~ msgid "citymap"
-#~ msgstr "Stadtplan"
-
-#~ msgid "hikingmap"
-#~ msgstr "Wanderkarte"
-
-#~ msgid "bicyclemap"
-#~ msgstr "Fahrradkarte"
-
-#~ msgid "board"
-#~ msgstr "Infotafel"
-
-#~ msgid "Charge"
-#~ msgstr "Benutzungsgebühr"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "Yahoo (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "Yahoo (GNOME/NetPBM)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "Yahoo (WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "Yahoo (WebKit GTK)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Ungültige Datensätze: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Prüfsummenfehler: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Unbekannte Datensätze: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Leere Koordinaten: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA-Einlesen fehlgeschlagen!"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Georeferenzierte Bilder anzeigen"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Noch nicht referenzierte Bilder"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Quellen für Objektvorlagen"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Quelle für Objektvorlagen"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Eine neue Quelle für Objektvorlagen zur Liste hinzufügen."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fehler beim Laden der Seite {0}"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Merkmale (leerer Wert löscht das Merkmal)"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Knoten ohne Merkmale und ohne Verbindung"
-
-#~ msgid "Unknown version"
-#~ msgstr "Unbekannte Version"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Daten werden vorbereitet...."
-
-#~ msgid "Error during parse."
-#~ msgstr "Fehler beim Parsen."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Plugin-Informationen von {0} Quelle geladen"
-#~ msgstr[1] "Plugin-Informationen von {0} Quellen geladen"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Bitte entweder site-josm.xml oder Wiki-Seiten hinzufügen."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Der Server hat einen internen Fehler zurückgeliefert. Versuchen Sie einen "
-#~ "kleineren Ausschnitt zu laden oder versuchen Sie es nach einiger Zeit "
-#~ "erneut."
-
-#~ msgid "error requesting update"
-#~ msgstr "Fehler bei der Aktualisierungsanforderung"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Das Plugin konnte nicht entfernt werden. Bitte melden Sie dieses Problem "
-#~ "den Verwaltern Ihres JOSM-Pakets."
-
-#~ msgid "Preparing..."
-#~ msgstr "Daten vorbereiten..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Daten hochladen..."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Warnung - Start des Plugins {0} wurde veranlasst. Dieses Plugin wird "
-#~ "nicht mehr benötigt."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Sie können den Zeitraum, nach dem diese Warnung erscheint über<br>über "
-#~ "die Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "OSM-Server kontaktieren..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Eigenschaften bearbeiten"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klicken Sie \"Neu Laden\", um die Liste zu aktualisieren"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr ""
-#~ "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Texte/Symbole anzeigen/verbergen"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Konnte keinen neuen Fehlerbericht anlegen. Ergebnis: {0}"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "TCX-Datei importieren..."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "TCX-Datei als GPS-Spur importieren"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Leitungsanzahl"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Konflikte auflösen"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Konflikte auflösen."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS Start: {0}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Keine Zeit für Punkt {0} x {1}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "GPX lesen..."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Uhrzeit synchronisieren"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Lesezeichen konnten nicht geschrieben werden."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Lesezeichen konnten nicht gelesen werden."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Benutzername (E-Mail) für den OSM-Server."
-
-#~ 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 "
-#~ "soll."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM-Passwort"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Sicherungsdateien erstellen"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Keine Plugin-Informationen gefunden."
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Das Plugin ist bereits vorhanden"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Fehlende Plugins herunterladen"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Fehler beim Lesen der Plugin-Informationsdatei: {0}"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Proxy-Server verwenden"
-
-#~ 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 "
-#~ "Linien zu zeichnen."
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Weiterhin werden die Tastaturkürzel aktiviert, wenn die Aktion das "
-#~ "erste Mal einem Menü oder Schaltknopf zugewiesen wird. Einige Änderungen "
-#~ "können also auch ohne Neustart aktiviert werden --- dann aber auch ohne "
-#~ "Erkennung von Konflikten. Dies ist ein weiterer Grund JOSM <b>neu zu "
-#~ "starten</b>, nachdem hier Änderungen durchgeführt wurden.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Sie werden feststellen, dass die Tastenauswahl auf der nächsten Seite "
-#~ "alle Java bekannten Tastaturen enthält und nicht nur die Tasten Ihrer "
-#~ "Tastatur. Bitte verwenden Sie nur Tasten, die auf Ihrer Tastatur "
-#~ "verfügbar sind. Falls Ihre Tastatur keine 'Copy'-Taste hat (PC-Tastaturen "
-#~ "haben diese nicht, aber Sun-Tastaturen), verwenden Sie sie nicht. "
-#~ "Außerdem gibt es 'Tasten', welche auf der Tastatur Abkürzungen "
-#~ "entsprechen (z.B. ':'/Doppelpunkt). Bitte verwenden Sie diese nicht, "
-#~ "sondern die Basistaste ('.'/Punkt auf der deutschen Tastatur, ...). Falls "
-#~ "Sie dies nicht tun, kann es Konflikte geben, da JOSM nicht erkennt, dass "
-#~ "Strg+Umschalt+. und Strg+: das gleiche ist...</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Beachten Sie, dass Tastaturkürzel beim Start von JOSM zugewiesen "
-#~ "werden. Sie müssen JOSM <b>neu starten</b>, um Ihre Änderungen zu "
-#~ "aktivieren.</p>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>Die letzte Seite zeigt die Steuertasten, welche JOSM automatisch an "
-#~ "Tastenkürzel vergibt. Für jeden der vier Typen gibt es drei Alternativen. "
-#~ "JOSM probiert im Falle eines Konflikts diese Alternativen in der "
-#~ "gegebenen Reihenfolge aus. Falls alle Alternativen fehlschlagen wird ein "
-#~ "zufälliges Tastenkürzel zugewiesen.</p>"
-
-#~ msgid "Set the language."
-#~ msgstr "Die Sprache festlegen."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parameter werden in der Reihenfolge ausgewertet, in der sie angegeben "
-#~ "werden. Stellen Sie also sicher, dass Daten existieren, bevor der "
-#~ "Parameter --selection verwendet wird."
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
-
-#~ msgid "Change"
-#~ msgstr "Ändern"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "{0} {1} löschen"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "{1} {0} löschen"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "{0} Konflikte in {1} Objekten auflösen"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Kann die Datei \"{0}\" nicht umbenennen."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Werte für alle Konflikte festlegen."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Alle Änderungen zum OSM-Server hochladen."
-
-#~ msgid "Add Selected"
-#~ msgstr "Ausgewähltes hinzufügen"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "Aktueller Unterschied: {0}s"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen."
-
-#~ msgid "Uploading data"
-#~ msgstr "Daten werden hochgeladen"
-
-#~ msgid "Downloading..."
-#~ msgstr "Daten werden geladen..."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Schließende Klammer erwartet."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Sicherung der Datei konnte nicht erstellt werden."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Anklicken: löschen. Umschalt: Lösche Wegabschnitt. Alt: unbenutze "
-#~ "Knotenpunkte nicht löschen. Strg: Lösche verweisende Objekte."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Die gewählten Punkte gehören unterschiedlichen Relationen an. Sollen Sie "
-#~ "wirklich vereint werden?"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Diese Knoten sind nicht in einem Kreis angeordnet."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Verwenden Sie Angaben in Dezimalgrad."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "{0} Knoten in {1} Knoten teilen"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Soll dieses Problem wirklich als ''erledigt''  markiert werden?"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Das Fernbedienungs-Plugin lauscht am Port 8111 des lokalen Rechners "
-#~ "(localhost). Dieser Port ist nicht konfigurierbar, weil er von externen "
-#~ "Anwendungen adressiert werden muss, die das Plugin nutzen."
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Einstellungen für das Fernbedienungs-Plugin."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktualisierte Plugins aktivieren"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "\"{0}\" entfernen für {1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "\"{0}\" entfernen für {1} \"{2}\""
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Ausgewählte Fehler korrigieren."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ausgewählte Fehler beim nächsten Mal ignorieren."
-
-#~ msgid "Grid"
-#~ msgstr "Raster"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Dieser Test prüft, ob zwei Straßen, Eisenbahnlinien oder Wasserwege sich "
-#~ "in der selben Ebene überschneiden, aber nicht durch einen Knoten "
-#~ "verbunden sind."
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Kachelstatus anzeigen"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Bitte melden Sie den Fehler unter {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Fügen Sie eine (möglichst ausführliche) Beschreibung der zum "
-#~ "Reproduzieren notwendigen Schritte bei!"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Stellen Sie sicher, dass folgende Informationen enthalten sind:"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Aktuelle Auswahl oder den kompletten Datensatz prüfen."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, vielleicht fehlende Merkmale."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-Schlüssel bei einer Nicht-Relation gefunden."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Falsch formatierte Knoten-ID"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
-#~ "gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
-#~ "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Die Quellen (URL oder Dateiname) der Definitionsdatei für Objektvorlagen. "
-#~ "Weitere Informationen unter http://josm.openstreetmap.de/wiki/"
-#~ "TaggingPresets"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Konnte nicht von der URL \"{0}\" lesen"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "URL \"{0}\" kann nicht interpretiert werden."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden."
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Kann einen ungeordneten Weg nicht duplizieren."
-
-#~ 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 ""
-#~ "Die ausgewählten Wege haben Knoten außerhalb des heruntergeladenen "
-#~ "Datenbereichs.\n"
-#~ "Das kann zu unabsichtlich gelöschten Knoten führen.\n"
-#~ "Sind Sie sich sicher, dass Sie fortfahren wollen?"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Berichtigtes Bild von Metacartas-WMS-Kartenkorrektur herunterladen"
-
-#~ msgid "Portcullis"
-#~ msgstr "Fallgatter"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Bilder mit AgPifoJ öffnen..."
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Einstellungen für WMS-Plugin"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Bitte wählen Sie eine Zeile zum Kopieren."
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Hilfe für WMS-Plugin"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
-#~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
-#~ "\n"
-#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach "
-#~ "folgendem Schema erledigen:\n"
-#~ "wmsplugin.url.1.name=LandSat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE-Karten ...\n"
-#~ "\n"
-#~ "Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-#~ "format=image/jpeg \n"
-#~ "\n"
-#~ "Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
-#~ "muss nur die relevant ID eingegeben werden.\n"
-#~ "Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
-#~ "manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
-#~ "Bild-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"
-#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht "
-#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung."
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Alpiner Wanderweg"
-
-#~ msgid "Open an other photo"
-#~ msgstr "Ein anderes Foto öffnen"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Einstellungsdate enthält Fehler. Erstelle eine Sicherung unter {0}."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Leeres Element in der Relation."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Gelöschtes Element ''{0}'' in der Relation."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Nicht-Weg ''{0}'' im Multipolygon."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Innerer Weg \"{0}\" ist außerhalb."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Fehler: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warnung: {0}"
-
-#~ msgid "Painting problem"
-#~ msgstr "Zeichenproblem"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Zeichennotizen prüfen."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Eine der ausgewählten Datei war leer!"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Autorenpanel anzeigen"
-
-#~ msgid "Open User Page"
-#~ msgstr "Nutzerseite öffnen"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Nutzerseite im Browser öffnen"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Nutzerdaten auswählen"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Ersetze Auswahl mit Nutzerdaten"
-
-#~ msgid "Please select some data"
-#~ msgstr "Bitte wählen Sie einige Daten"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Bitten verwenden Sie das Autorenpanel um einen Nutzer zu wählen"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Dies funktioniert nicht mit anonymen Nutzern"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch "
-#~ "heruntergeladen werden."
-
-#~ msgid "Aborting..."
-#~ msgstr "Abbrechen..."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Zum OSM-Server hochladen..."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Verbinden zu {0}..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Seiten konfigurieren..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Das Plugin ist bereits vorhanden. Wollen Sie das aktuelle Plugin löschen "
-#~ "und danach erneut herunterladen?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autoren: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Ebenen: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Befehlsliste: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikte: {0}"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "standard"
-#~ msgstr "Standard"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Flächenförmiger Weg ist nicht geschlossen."
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Öffnet das OpenStreetBugs-Fenster und aktiviert das automatische "
-#~ "Herunterladen"
-
-#~ 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"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Berliner Straße</b> - 'Berliner' und 'Straße' in einem Schlüssel oder "
-#~ "Namen."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Berliner Straße\"</b> - 'Berliner Straße' in einem Schlüssel oder "
-#~ "Namen."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Ber</b> - 'Ber' irgendwo im Namen."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Ber</b> - kein 'Ber' im Namen."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - Objekt mit gegebener ID"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - Objekte mit gegebener Knotenanzahl"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : "
-#~ "enthält)"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Mehr als ein Weg mit \"from\" gefunden."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Mehr als ein Weg mit \"to\" gefunden."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Unbekannte Role \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Unbekannter Elementtyp für \"{0}\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Kein \"from\"-Weg gefunden."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Kein \"to\"-Weg gefunden."
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "WICHTIG: Einige Daten sind sehr weit von den\n"
-#~ "aktuellen Lambert-Zonengrenzen entfernt.\n"
-#~ "Laden Sie nach dieser Nachricht keine Daten hoch.\n"
-#~ "Machen Sie die letzte Aktion rückgängig, speichern Sie\n"
-#~ "die Daten und starten Sie eine neue Ebene mit der neuen Zone."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Zeit mit GPS-Gerät synchronisieren"
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden."
-
-#~ msgid "intermedia"
-#~ msgstr "mittelschwer"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Getränkeladen bearbeiten"
-
-#~ msgid "optician"
-#~ msgstr "Optiker"
-
-#~ msgid "sports"
-#~ msgstr "Sport"
-
-#~ msgid "advance"
-#~ msgstr "fortgeschritten"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} verbleiben. Überspiele {4}: {5} (id: {6})"
-
-#~ msgid "Public"
-#~ msgstr "Öffentlich"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich"
-
-#~ msgid "No username provided."
-#~ msgstr "Kein Nutzername angegeben."
-
-#~ msgid "No password provided."
-#~ msgstr "Kein Passwort angegeben."
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Zuerst eine Ebene öffnen (GPX, OSM, cache)"
-
-#~ msgid "Zone"
-#~ msgstr "Zone"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambert-Zone {0} im Cache ist mit der gegenwärtigen Lambert-Zone {1} "
-#~ "inkompatibel"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambert-Zone"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Bild vom französischen Kataster-WMS herunterladen"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Montagetabelle wählen"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "Lambert-Zone manuell setzen (z.B. für Orte zwischen Zonen)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert-Zone 1 Zwischenspeicherdatei (.1)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert-Zone 2 Zwischenspeicherdatei (.2)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert-Zone 3 Zwischenspeicherdatei (.3)"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert-Zone 4 Zwischenspeicherdatei (.4)"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Automatisches \"source\"-Merkmal:"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Eine spezielle Schnittstelle für das französische Kataster-WMS auf www."
-#~ "cadastre.gouv.fr<BR><BR>Bitte lesen Sie die Nutzungsbedingungen (auf "
-#~ "französisch):<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\">http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html</a><BR>bevor SIe Daten die mit Hilfe "
-#~ "dieses Plugins erstellt wurden, hochladen."
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Bildladefaktor:"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "{0}={1} setzen für {2} \"{3}\""
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "{0}={1} setzen für {2} {3}"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Um das Kataster-WMS-Plugin zu aktivieren, ändern Sie die JOSM-Projektion "
-#~ "auf Lambert und starten neu."
-
-#~ msgid "Save and Exit"
-#~ msgstr "Speichern und Beenden"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Ausgewähltes entfernen"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Alle ausgewählten Objekte aus der Relation entfernen"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Neue Ebene hinzufügen"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Rasterzentrum: {0}"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Die Position der gewählten WMS-Ebene anpassen"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Max. Höhe (Meter)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Max. Breite (Meter)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Max. Länge (Meter)"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Gebäudeumriss extrahieren"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Stadt {0} nicht gefunden oder im WMS nicht vorhanden.\n"
-#~ "Bitte prüfen Sie die Verfügbarkeit unter  www.cadastre.gouv.fr"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Karte"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Aktivieren der aktualisierten Plugins fehlgeschlagen. Prüfen Sie, ob JOSM "
-#~ "die Rechte besitzt die vorhandenen Plugins zu überschreiben."
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
-#~ "Internetverbindung."
-
-#~ msgid "Login"
-#~ msgstr "Anmelden"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
-
-#~ msgid "Delete Layer"
-#~ msgstr "Ebene löschen"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Plugins herunterladen"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Löschen und Herunterladen"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Trotzdem verbinden"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Konflikte auflösen"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Trotzdem vereinen"
-
-#~ msgid "autozoom"
-#~ msgstr "Automatisch Zoomen"
-
-#~ msgid "autoload tiles"
-#~ msgstr "Kacheln automatisch laden"
-
-#~ msgid "SlippyMap"
-#~ msgstr "Karte"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Einstellungen für das Karten-Plugin."
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Automatisches Zoomen: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Kacheln automatisch laden: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max. Zoomstufe: "
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie "
-#~ "vorm Hochladen alles."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Trotzdem fortfahren"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Momentan können nur maximal zwei Flächen vereinigt werden."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr ""
-#~ "\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen."
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Keine Überschneidungen gefunden. Es wurde nicht geändert."
-
-#~ msgid "Move Up"
-#~ msgstr "Nach oben"
-
-#~ msgid "Move Down"
-#~ msgstr "Nach unten"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relationseditor: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Konflikte lösen"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Mehr als ein Element mit \"via\" gefunden."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Kein \"via\"-Knoten oder Weg gefunden."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Bitte mindestens einen Knoten, Weg oder Relation wählen. Nur bereits "
-#~ "hochgeladene Elemente haben eine Geschichte."
-
-#~ msgid "Update Data"
-#~ msgstr "Daten aktualisieren"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ungültige Projektion"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Ändern Sie die Projektion vorher auf {0}."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Punkte und GPS-Spuren anhand der Positionsverschlechterung (DOP) färben. "
-#~ "Ihr GPS-Empfänger muss diese Information aufzeichnen."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie "
-#~ "fortfahren?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Die aktuelle Datenebene mittels des Servers aktualisieren (neu "
-#~ "herunterladen)"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Die Projektion kann nicht aus den Einstellungen ermittelt werden. "
-#~ "Verwende EPSG:4326"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Mausrad oder Doppelklick.   Karte bewegen: Rechte Maustaste halten "
-#~ "und Maus bewegen.   Auswählen: Klick."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Bitte wählen Sie erst ein Lesezeichen."
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Relation #{0} bearbeiten"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Es sind Konflikte beim Importieren aufgetreten."
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Ein unerwarteter Fehler trat auf.\n"
-#~ "\n"
-#~ "Dies ist immer ein Programmierfehler. Wenn Sie die aktuelle Version\n"
-#~ "von JOSM einsetzen, würden wir uns über einen Fehlerbericht freuen."
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Versuchen Sie zuerst eine Aktualisierung auf die neueste Versionen von "
-#~ "JOSM sowie aller Plugins, bevor Sie den Fehler melden."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr ""
-#~ "Übertragung wegen eines Fehlers abgebrochen (Wiederholung in 5 Sekunden):"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Ziehen: Objekte verschieben. Umschalt: Auswahl hinzufügen. Strg: Auswahl "
-#~ "umschalten. Umschalt-Strg: drehen oder Auswahl ändern."
-
-#~ msgid "Fade background: "
-#~ msgstr "Hintergrund ausblenden: "
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "{0} Treffer für {1} in GPS-Spur {2} gefunden"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Die gewählten Bilder enthalten keine Zeitinformation."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Bilder enthalten keine Zeitinformation"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine "
-#~ "andere."
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Zeitdifferenz von {0} Tagen)"
-
-#~ msgid "Default Values"
-#~ msgstr "Standardwerte"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Bitte wählen Sie zuerst die gewünschten Koordinaten."
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "{0} von {1} Bildern mit GPS-Spur synchronisiert."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Offset zwischen GPS-Spur und Bildern: {0}m {1}s"
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Beim Synchronisieren der Bilder mit der GPS-Spur ist ein Fehler "
-#~ "aufgetreten. Sie können die Schieberegler manuell einstellen, um die "
-#~ "Bilder zu synchonisieren."
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Auswahl \"{0}\" wird in Relation \"{1}\" verwendet.\n"
-#~ "Aus Relation entfernen?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Auswahl \"{0}\" wird mit Rolle {2} in Relation \"{1}\" verwendet.\n"
-#~ "Aus Relation entfernen?"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Keine Daten zum Aktualisieren gefunden. Haben Sie bereits eine Datenebene "
-#~ "heruntergeladen oder geöffnet?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Die folgenden Fehler sind während des Herunterladens aufgetreten:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Fehler beim Herunterladen"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Informationsbüro bearbeiten"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Wegweiser (Wandern)"
-
-#~ msgid "Map Type"
-#~ msgstr "Kartentyp"
-
-#~ msgid "Board Type"
-#~ msgstr "Tafeltyp"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Feld- oder Waldweg Grad 1 (asphaltiert) bearbeiten"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Feld- oder Waldweg Grad 2 (Schotter) bearbeiten"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Feld- oder Waldweg Grad 3 (befestigt) bearbeiten"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Feld- oder Waldweg Grad 4 (wenig befestigt) bearbeiten"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Feld- oder Waldweg Grad 5 (unbefestigt) bearbeiten"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Anspruchsvoller alpiner Wanderweg"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Anspruchsvollen alpinen Wanderweg bearbeiten"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Schwerer alpiner Wanderweg"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Schweren alpinen Wanderweg bearbeiten"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Zugbrücke bearbeiten"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Fallgatter bearbeiten"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Flughafen bearbeiten"
-
-#~ msgid "Full Screen"
-#~ msgstr "Vollbild"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Vollbilddarstellung umschalten"
-
-#~ msgid "Add grid"
-#~ msgstr "Gitter hinzufügen"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- aktive Version ist {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> Sprache erstellen."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> oder <A HREF="
-#~ "\"{1}\">deutscher</A> Sprache erstellen."
-
-#~ msgid "Optional"
-#~ msgstr "Optional"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Ein weiteres Georeferenzierungsplugin für JOSM. Es korreliert Bilder mit "
-#~ "GPS-Spuren oder importiert mit EXIF georeferenzierte Bilder."
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr ""
-#~ "Ein spezielles Plugin für die WMS-Server der französischen "
-#~ "Landesvermessung."
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Wege mit einem Versatz duplizieren."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Das Hauptmerkmal dieses Plugins ist die Möglichkeit Punkte in einem GPX "
-#~ "Track zu löschen. Dieses Plugin kann dazu genutzt werden Tracks für das "
-#~ "Hochladen nach OSM vorzubereiten, z.B. um uninteressante Abschmitte eines "
-#~ "Tracks zu löschen"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Erlaubt dem Benutzer verschiedene Farbschemata anzulegen und zwischen "
-#~ "diesen zu wechseln. Einfach die Farben wechseln und ein neues Schema "
-#~ "anlegen. Kann zum Umschalten auf einen weißen Hintergrund mit passenden "
-#~ "Farben, zur besseren Sichtbarkeit in hellem Sonnenlicht, eingesetzt "
-#~ "werden. Siehe Bearbeiten, Einstellungen, Karten-Einstellungen"
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Etliche Werkzeuge, welche einem das Leben vereinfachen. Zum Beispiel Weg "
-#~ "vereinfachen, Flächen verbinden, Springe zur Position"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Zeigt georeferenzierte Bilder als Hintergrund in JOSM (WMS Server, "
-#~ "Yahoo, ...)."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Bitte genau drei Knoten oder einen Weg mit genau drei Knotenpunkten "
-#~ "auswählen."
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-Onlinehilfe"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Sie können nur die Hilfeseiten der JOSM-Onlinehilfe bearbeiten."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Geschichte der OSM-Wege oder -Knoten anzeigen."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Ein Werkzeug, um mit Autoren oder Nutzern zu arbeiten. Auswählen von "
-#~ "Kartendaten, welche der Nutzer bearbeitet hat oder Öffnen des Browsers "
-#~ "mit Nutzerprofilen."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "TCX-Dateien direkt aus JOSM heraus laden."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Zeigt das OSM-Mapnik-Kartenraster in JOSM. Das Plugin kann die Kacheln "
-#~ "als Hintergrund laden und Aktualisierungen veranlassen."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negative Werte für die westliche oder südliche Hemisphere."
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simuliert einen Klick bei einer kleinen und kurzen Mausbewegung. Dies ist "
-#~ "nützlich bei Tablets, wenn das Problem besteht, dass einfaches Klicken "
-#~ "ohne Mausbewegung nur schwer möglich ist (generelles Java - Tablet "
-#~ "Problem)"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Kann Knotenpunkte nicht vereinigen: Ein Weg, der noch verwendet wird, "
-#~ "müsste gelöscht werden."
-
-#~ msgid "Start routing"
-#~ msgstr "Routenführung starten"
-
-#~ msgid "<multiple>"
-#~ msgstr "<mehrere>"
-
-#~ msgid "Fix relations"
-#~ msgstr "Relationen korrigieren"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Selbstüberlappende Gebiete verbunden"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Flächen verbinden: Kurze Wege entfernen"
-
-#~ msgid "Closed Way"
-#~ msgstr "Weg geschlossen"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Routenknoten entfernen"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Klicken und bewegen, um Routenknoten zu verschieben."
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Klicken, um Routenknoten hinzuzufügen."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Änderungen sind nicht gespeichert. Ebene trotzdem löschen?"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Alle ausgewählten Objekte als Elemente hinzufügen"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen."
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "JOSM unterstützt die Protokoll-Versionen 0.5 und 0.6, während der Server "
-#~ "{0} bis {1} unterstützt."
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert."
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Kein Änderungssatz zum Hochladen vorhanden"
-
-#~ msgid "Error processing changeset upload response"
-#~ msgstr "Fehler beim Verbarbeiten des Änderungssatzes im Server"
-
-#~ msgid "Not initialized"
-#~ msgstr "Nicht initialisiert"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Fehlende Versionsnummer in OSM-Daten"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Unbekannte Version: {0}"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Fehler beim Einlesen"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Die Projektion \"{0}\" ist nur für Breiten\n"
-#~ "zwischen 46,1° und 57 ° geeignet.\n"
-#~ "Verwenden Sie ein anderes Projektionssystem, falls\n"
-#~ "Sie keinen französischen WMS-Server nutzen.\n"
-#~ "Laden Sie nach dieser Nachricht keine Daten hoch."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Die Projektion \"{0}\" ist nur für Breiten\n"
-#~ "zwischen 45,7° und 47,9° und Längen zwischen\n"
-#~ "5,7° and 10,6° geeignet. Verwenden Sie ein\n"
-#~ "anderes Projektionssystem, falls Sie keine Daten\n"
-#~ "aus der Schweiz oder Liechtenstein verwenden.\n"
-#~ "Laden Sie nach dieser Nachricht keine Daten hoch."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Maximallänge zum Linienzeichnen für lokale Dateien (in Meter). Verwenden "
-#~ "Sie \"-1\", um alle Linien zu zeichnen."
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Kann keinen numerischen Wert aus der Antwort lesen"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Hochladen der Daten aus unbekanntem Grund fehlgeschlagen"
-
-#~ msgid "linked"
-#~ msgstr "verbunden"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Bild mit Pfad {0} existiert nicht oder ist nicht lesbar."
-
-#~ msgid "More details"
-#~ msgstr "Mehr Details"
-
-#~ msgid "% of lat:"
-#~ msgstr "% der Breite:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% der Länge:"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Die Projektion kann nicht aus den Einstellungen ermittelt werden. "
-#~ "Verwende Merkartor"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Fehlendes \"ref\"-Attribut bei Element der Relation {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation "
-#~ "{0}"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Fehlendes \"type\"-Attribut bei Element {0} der Relation {1}"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr ""
-#~ "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der "
-#~ "Relation {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Ungültiger Wert \"{1}\" des \"version\"-Attributs des OSM-Objekts mit ID "
-#~ "{0}"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Fehlendes \"version\"-Attribut bei OSM-Objekt mit ID {0}"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Aufbau der Verbindung zum OSM-Server {0} ist fehlgeschlagen.\n"
-#~ "Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre "
-#~ "Internetverbindung."
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ÄndereRelationsElementRolle"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Versionskonflikt für {0} {1} auflösen"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Konflikte in Knotenliste des Weges {0} auflösen"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} verbleibende Merkmalskonflikte zu beheben"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "Element {0} nicht in der Liste gefunden"
-
-#~ msgid "({0} entry)"
-#~ msgid_plural "({0} entries)"
-#~ msgstr[0] "({0} Eintrag)"
-#~ msgstr[1] "({0} Einträge)"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - Schlüssel 'type' mit exakt dem Wert 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - Schlüssel 'type' mit beliebigem Wert. Auch <b>*=wert</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Falsche Anzahl an Parametern für Knoten-Operator."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Ungültiger Wert für Knoten-Operator: {0}. Operator erwartet Knotenanzahl "
-#~ "oder -bereich, z.B. \"nodes:1-20\"."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Ungültiger Wert für ID-Operator: {0}. Zahl erwartet."
-
-#~ msgid "argument \"view\" must not be null"
-#~ msgstr "Argument \"view\" darf nicht Null sein"
-
-#~ msgid "argument \"adjustable\" must not be null"
-#~ msgstr "Argument \"adjustable\" darf nicht Null sein"
-
-#~ msgid "parameter \"way\" must not be null"
-#~ msgstr "Parameter \"way\" darf nicht Null sein"
-
-#~ msgid "parameter way must not be null"
-#~ msgstr "Parameter \"way\" darf nicht Null sein"
-
-#~ msgid "parameter \"my\" most not be null"
-#~ msgstr "Parameter \"my\" darf nicht Null sein"
-
-#~ msgid "parameter \"their\" must not be null"
-#~ msgstr "Parameter \"their\" darf nicht Null sein"
-
-#~ msgid "parameter their must not be null"
-#~ msgstr "Parameter \"their\" darf nicht Null sein"
-
-#~ msgid "parameter my most not be null"
-#~ msgstr "Parameter \"my\" darf nicht Null sein"
-
-#~ msgid "parameter 'key' must not be null"
-#~ msgstr "Parameter \"key\" darf nicht Null sein"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Unvollständiges anwenden"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}."
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Ende des Pfades erreicht"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Kreuzung erreicht"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin erfolgreich heruntergeladen. JOSM bitte neustarten."
-#~ msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten."
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Startknoten an einem Wegende auswählen"
-
-#~ msgid "Resolve conflicts in member list of of relation {0}"
-#~ msgstr "Konflikte in der Elementenliste für Relation {0} auflösen"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "{0} Merkmalskonflikte für {1} {2} auflösen"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "Kann unentschiedenes Merkmalselement nicht anwenden"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "Kann unentschiedenen Konflikt nicht auflösen"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr "unerwarteder Wert für die Eigenschaft conflict.resolution = "
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht "
-#~ "ausgeführt werden."
-
-#~ msgid ""
-#~ "Properties in the merged element. They will replace properties in my "
-#~ "elements when  merge decisions are applied."
-#~ msgstr "Vereinigte Merkmale werden die lokalen nach der Übernahme ersetzen."
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht "
-#~ "ausgeführt werden."
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "Parameter \"{0}\" darf nicht NULL sein."
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr ""
-#~ "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Aktuelle Liste der vereinigten Elemente fixieren."
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben."
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Den ausgewählten Eintrag eine Position nach oben schieben."
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Den ausgewählten Eintrag eine Position nach unten schieben."
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Wähle <strong>{0}</strong> um das Vereinigen abzuschließen.</html>"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Wähle <strong>{0}</strong> um das Vereinigen zu beginnen.</html>"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "Unerwarteter Spaltenindex ({0})"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Es sind noch nicht alle Konflikte gelöst!<br>Wähle <strong>{0}</"
-#~ "strong> um die bereits aufgelösten Konflikte anzuwenden.<br>(Alle übrigen "
-#~ "Konflikte können später behoben werden)<br>Wähle <strong>{1}</strong> um "
-#~ "zum Dialog zurückzukehren.</html>"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})."
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "Parameter \"index\" hat unerwarteten Wert {0}."
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopiere meine gewählten Elemente an das Ende der Liste vereinigter "
-#~ "Elemente."
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Kopiere deren gewählten Elemente vor das erste ausgewählte Element der "
-#~ "Liste vereinigter Elemente."
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Kopiere meine gewählten Elemente hinter das erste ausgewählte Element der "
-#~ "Liste vereinigter Elemente."
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Kopiere meine gewählten Elemente vor das erste ausgewählte Element der "
-#~ "Liste vereinigter Elemente."
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter "
-#~ "Elemente."
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Kopiere meine gewählten Elemente an den Anfang der Liste vereinigter "
-#~ "Elemente."
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil."
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "Anpassung {0} ist noch nicht registriert."
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "Anpassung {0} ist noch nicht registriert. Kann Teilnahme in "
-#~ "synchronisierter Anpassung nicht setzen."
-
-#~ msgid "Uploading"
-#~ msgstr "Hochladen"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Hochladen zu OSM-API fehlgeschlagen"
-
-#~ msgid "preference {0} missing. Can't initialize OsmApi"
-#~ msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Der eingegebene Link oder die ID konnte dem gewählten Service nicht "
-#~ "zugeordnet werden. Bitte versuchen Sie es erneut."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)"
-
-#~ msgid ""
-#~ "<html>Uploading failed because the server has a newer version of "
-#~ "one<br>of your nodes, ways or relations.<br>Please synchronize your local "
-#~ "dataset using <br><strong>File-&gt;Update Data</strong>, resolve<br>any "
-#~ "conflicts and try to upload again.</html>"
-#~ msgstr ""
-#~ "<html>Hochladen fehlgeschlagen, da der Server eine neuere Version einer "
-#~ "Ihrer<br>Knoten, Wege oder Relationen hat.<br>Bitte synchronisieren Sie "
-#~ "Ihren lokalen Datensatz mittels <br><strong>Datei-&gt;Daten "
-#~ "aktualisieren</strong>, lösen<br>alle Konflikte und versuchen das "
-#~ "Hochladen erneut.</html>"
-
-#~ msgid ""
-#~ "WARNING: preference '{0}' or api version {1} of dataset requires to use "
-#~ "changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "WARNUNG: Einstellung '{0}' oder API-Version {1} erfordern die Nutzung von "
-#~ "Änderungssätzen, aber die API kann diese nicht verarbeiten. "
-#~ "Änderungssätze werden ignoriert."
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because the server has a newer "
-#~ "version of one<br>of your nodes, ways or relations.<br>The conflict is "
-#~ "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-#~ "server has version {2}, your version is {3}.<br>Please synchronize your "
-#~ "local dataset using <br><strong>File-&gt;Update Data</strong>, "
-#~ "resolve<br>any conflicts and try to upload again.</html>"
-#~ msgstr ""
-#~ "<html>Hochladen <strong>fehlgeschlagen</strong>, da der Server eine "
-#~ "neuere Version einer Ihrer<br>Knoten, Wege oder Relationen hat.<br>Der "
-#~ "Konflikt wird von <strong>{0}</strong> mit ID <strong>{1}</strong> "
-#~ "verursacht,<br>der Server hat Version {2}, Ihre Version ist {3}.<br>Bitte "
-#~ "synchronisieren Sie Ihren lokalen Datensatz mittels <br><strong>Datei-&gt;"
-#~ "Daten aktualisieren</strong>, lösen<br>alle Konflikte und versuchen das "
-#~ "Hochladen erneut.</html>"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualisierung fehlgeschlagen"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "Unerwarteter Rückgabewert: {0}"
-
-#~ msgid "Update Selection"
-#~ msgstr "Auswahl aktualisieren"
-
-#~ msgid "Selection too big"
-#~ msgstr "Auswahl zu groß"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Konflikt festgestellt"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> Sprache erstellen."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> oder <A HREF="
-#~ "\"{1}\">deutscher</A> Sprache erstellen."
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Die folgenden Fehler sind während des Herunterladens aufgetreten:"
-
-#~ msgid "changeset"
-#~ msgstr "Änderungssatz"
-
-#~ msgid "changesets"
-#~ msgstr "Änderungsätze"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "Parameter \"{0}\" darf nicht NULL sein"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Benutzername (E-Mail) für den OSM-Server."
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM-Benutzername (E-Mail)"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
-#~ "gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
-#~ "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren."
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "WARNUNG: Einstellung \"{0}\" oder API-Version \"{1}\" erfordern die "
-#~ "Nutzung von Änderungssätzen, aber die API kann diese nicht verarbeiten. "
-#~ "Änderungssätze werden ignoriert."
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
-#~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
-#~ "\n"
-#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach "
-#~ "folgendem Schema erledigen:\n"
-#~ "wmsplugin.url.1.name=LandSat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE-Karten ...\n"
-#~ "\n"
-#~ "Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
-#~ "\n"
-#~ "Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
-#~ "muss nur die relevante ID eingegeben werden.\n"
-#~ "Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
-#~ "manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
-#~ "Bild-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"
-#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht "
-#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Sie können die Maus oder Strg+Pfeiltasten benutzen um zu zoomen und zu "
-#~ "verschieben."
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Fehler bei der Kommunikation mit dem Server."
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ 64-Bit-"
-#~ "Ganzzahl"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive "
-#~ "64-Bit-Ganzzahl (>=0)"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "notwendiges Attribut \"{0}\" fehlt"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
-#~ "OsmPrimitivTyp"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr ""
-#~ "nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
-#~ "Wahrheitswert"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive "
-#~ "Ganzzahl"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, auch wiederherstellen"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Zusätzliche Knoten wiederherstellen?"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "{0} Objekte wiederherstellen"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Abhängige Objekte wiederherstellen?"
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Relation wiederherstellen..."
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nein, Operation abbrechen"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Weg wiederherstellen..."
-
-#~ msgid "Delete mine"
-#~ msgstr "Meine löschen"
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Prüfe ob Knoten {0} gelöscht wurde..."
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Konnte Objekt mit ID {0} im aktuellen Datensatz nicht finden"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Objekt fehlt"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Fehler beim Hochladen der gewählten Objekte"
-
-#~ msgid "Keep mine"
-#~ msgstr "Meine behalten"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Prüfe ob Objekt {0} gelöscht wurde..."
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Objekt auf Server gelöscht"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Objekt aktualisieren"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Nur {0} {1} synchronisieren"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Die Projektion kann nicht aus den Einstellungen ermittelt werden. "
-#~ "Verwende Merkartor"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Objekt bereits gelöscht"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Aktualisiert die ausgewählten Objekt vom Server"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Gelöschte oder verschobene Objekte"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Bei der Verbindung zum Server \"{0}\" ist ein Fehler aufgetreten."
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Es sind  <strong>{0}</strong> Objekte für eine<br>individuelle "
-#~ "Aktualisierung ausgewählt.<br><br>Bitte maximal {1} Objekte auswählen.</"
-#~ "html>"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"."
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr ""
-#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-"
-#~ "Name."
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr ""
-#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige "
-#~ "Klasse."
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr ""
-#~ "Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"."
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Es gibt {0} zusätzliche Knotenpunkte vom Weg {1},<br>die auf dem "
-#~ "Server gelöscht sind.<br><br>Sollen diese Knotenpunkte auch "
-#~ "wiederhergestellt werden?</html>"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check these primitives individually.<br>Click <strong>{2}</"
-#~ "strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Es gibt {0} Objekte im lokalen Datensatz die<br>auf dem Server "
-#~ "möglicherweise gelöscht sind. Wenn diese<br>\r\n"
-#~ "Objekte erst später aktualisiert oder gelöscht werden ist<br>ein Konflikt "
-#~ "sehr wahrscheinlich.<br><br>Kicken Sie auf <strong>{1}</strong> um die "
-#~ "Objekte einzeln zu überprüfen.<br>Kicken Sie auf <strong>{2}</strong> um "
-#~ "diese Meldung zu ignorieren.<br>\r\n"
-#~ "</html>"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\""
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID "
-#~ "\"{1}\" verglichen werden"
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr ""
-#~ "Für das Objekt mit ID {0} wurde im Datensatz keine Geschichte gefunden."
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "1 Objekt entfernen"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Konnte kein Objekt mit ID {0} und Version {1} im Datensatz finden"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>Das Objekt mit ID <strong>{0}</strong> wurde von einem<br>anderen "
-#~ "Bearbeiter auf dem Server gelöscht.<br><br>Wählen Sie <strong>{1}</"
-#~ "strong>, um Ihr Objekt zu behalten und den Gelöscht-Status zu ignorieren."
-#~ "<br>Ihrem Objekt wird eine neue ID zugewiesen.<br>Wählen Sie <strong>{2}</"
-#~ "strong>, um den Serverstatus zu akzeptieren und Ihr Objekt zu löschen."
-#~ "<br>Wählen Sie <strong>{3}</strong> zum Abbrechen.<br>"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Verbindung  zu API {0} konnte nicht geöffnet werden"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\""
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\""
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "Unerwartetes Format der neuen Version des geänderten Objekts {0}. Wert "
-#~ "ist \"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Hochladen <strong>fehlgeschlagen</strong>, da das zu löschende "
-#~ "Objekt<br>auf dem Server schon gelöscht ist.<br><br>Die Fehlermeldung ist:"
-#~ "<br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>Das openstreetbugs-Plugin verwendet den alten Server auf appspot."
-#~ "com.<br>Ein neuer Server ist unter schokokeks.org verfügbar.<br>Möchtest "
-#~ "du zum neuen Server wechseln? (dringend empfohlen)</html>"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "Fehler beim TangoGPS-Import!"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API-Initialisierung fehlgeschlagen"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "API-Initialisierung fehlgeschlagen - bitte später versuchen"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Fehler bei der Kommunikation mit dem Server"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ja, diese ID zurücksetzten"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Aus dem lokalen Datensatz löschen"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Exakte Kopie der lokalen Version behalten"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "ID auf 0 zurücksetzen"
-
-#~ msgid "image loading..."
-#~ msgstr "Lade Bild..."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Aktuelle Anzahl an Modifikationen ({0}) überschreitet die maximale Anzahl "
-#~ "({1})."
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "Entferne Referenz aus Relation {0}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "Entferne Referenz aus Weg {0}"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Aus dem Datensatz löschen"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Länge des Wertes ({3}) der Eigenschaft \"{0}\" von Element {1} "
-#~ "überschreitet die maximal erlaubte Länge ({2})."
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "Achtung: Unbekanntes Format der API-URL. Die Weiterleitung zur OSM-"
-#~ "Änderungsseite des Elements könnte fehlschlagen.\r\n"
-#~ "API-URL ist: \"{0}\""
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Um die lokale Version zu erhalten muss JOSM die ID von {0} {1} auf "
-#~ "Null zurücksetzen.<br>Beim nächsten mal Hochladen wird der Server dann "
-#~ "eine neue ID zuteilen.<br>Sind Sie hiermit einverstanden?</html>"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Das Laden der Historie vom Server ist fehlgeschlagen. Details:<br>"
-#~ "{0}</html>"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Version <strong>{0}</strong> erzeugt am <strong>{1}</strong> von "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Historie für {0} {1}"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Lade Historie für {0} mit ID {1}"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Übernehme deren Löschstatus"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Übernehme meinen Löschstatus"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Löschstatus ist unterschiedlich."
-
-#~ msgid "Visible State:"
-#~ msgstr "Löschstatus:"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Mein Element mit der Nr. {0} in der Version {1} ist sichtbar, obwohl es "
-#~ "in der niedrigeren Version {2} gelöscht ist. Es wird daher weiterhin "
-#~ "behalten. "
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "Tabellenindex außerhalb der Grenzen ({0})"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene "
-#~ "\"{1}\" nicht mehr existiert."
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Zone {0}"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geografisch"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Drehen {0} {1}"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "Konflikt mit Element \"{0}\" besteht bereits"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Die markierten Relationmitglieder oder die gesamte Liste sortieren"
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Ebene {0} muss in der Ebenenliste sein"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "XML-Einstellungsdatei (URL oder Dateiname) für {0} Definitionen"
-
-#~ msgid "Icon paths"
-#~ msgstr "Symbolpfad"
-
-#~ msgid "Used style"
-#~ msgstr "Benutzter Stil"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "{0} {1} ändern"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "{0} {1} hinzufügen"
-
-#~ msgid "No data"
-#~ msgstr "Keine Daten"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Standard kopieren"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Standard (siehe Tooltip für detailierte Informationen)"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikte in den Daten"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Neue XML-Quelle zur Liste hinzufügen"
-
-#~ msgid "Remove relation member for {0} {1}"
-#~ msgstr "Enferne Relationselement {0} {1}"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Der Server hat einen Fehler mit Kode [{0} gemeldet"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Mausrad, Doppelklick oder Strg + Hoch/Runter <b>Karte "
-#~ "bewegen:</b> Rechte Maustaste halten und Maus bewegen oder Pfeiltasten "
-#~ "nutzen. <b>Auswahl:</b> Klick."
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not able to handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "WARNUNG: Einstellung  ''{0}'' oder API-Version ''{1}'' des Datensatz "
-#~ "verlangen die Nutzung von Änderungssätzen, aber die API kann diese nicht "
-#~ "verarbeiten. Ignorieren der Änderungssätze."
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Sie haben mehr als {0} Elemente verschoben. Das Verschieben mehrerer "
-#~ "Elemente geschieht häufig unbeabsichtigt.\n"
-#~ "Wollen Sie sie wirklich verschieben?"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Elemente: {0} (verbunden: {1})"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Relationselement {0} {1} entfernen"
-
-#~ msgid "image "
-#~ msgstr "Bild "
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "Fehler bei Aktualisierungsanforderung: Nicht Zoomstufe 12"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "nicht sichtbar (auf dem Server)"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Verweise von OSM herunterladen..."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Verweise herunterladen..."
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' darf nicht null sein"
-
-#~ msgid ""
-#~ "<html>The relation has changed outside of the editor.<br>Your edit can't "
-#~ "be applied directly, a conflict has been created instead.</html>"
-#~ msgstr ""
-#~ "<html>Die Relation wurde ausserhalb des Editors verändert.<br>Ihre "
-#~ "Änderung kann nicht direkt angewandt werden, daher wurde ein Konflikt "
-#~ "erstellt.</html>"
-
-#~ msgid "Conflict created"
-#~ msgstr "Ein Konflikt wurde erstellt"
-
-#~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
-#~ "{0}"
-#~ msgstr ""
-#~ "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die "
-#~ "Ausnahme war: {0}"
-
-#~ msgid "Linked"
-#~ msgstr "Verknüpft"
-
-#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-#~ msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen."
-
-#~ msgid ""
-#~ "marked way {0} incomplete because referred nodes are missing in the "
-#~ "loaded data"
-#~ msgstr ""
-#~ "Weg {0} als unvollständig markiert, weil referenzierte Knoten in den "
-#~ "geladenen Daten fehlen"
-
-#~ msgid "parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "Parameter ''{0}'' > 0 verlangt. Erhielt {1}"
-
-#~ msgid ""
-#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-#~ msgstr ""
-#~ "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet"
-#~ "()"
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() "
-#~ "gefunden."
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
-
-#~ msgid "id parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "Id-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Alle ausgewählten Objekte im momentanen Datensatz nach dem letzten "
-#~ "ausgewählten Element hinzufügen"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Alle ausgewählten Objekte im momentanen Datensatz vor dem ersten Element "
-#~ "hinzufügen"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Alle ausgewählten Objekte im momentanen Datensatz nach dem letzten "
-#~ "Element hinzufügen"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen "
-#~ "sie wirklich verbunden werden?"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Alle neuen Wege wurden Element in einer Relation gemacht.\n"
-#~ "Bitte prüfen und korrigieren Sie dies falls notwendig."
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Die ausgewählten Merkmale löschen"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "Alle Änderungen mit einer Anfrage hochladen"
-
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Auf die Systemeigenschaft ''{0}'' konnte aus Sicherheitsgründen nicht "
-#~ "zugegriffen werden. Die Ausnahme lautet: {1}"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Die Datei ''{0}'' konnte nicht gelesen werden. Der Fehler lautet: "
-#~ "<br>{1}</html>"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br> Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Beim Wiederherstellen der Sicherheitskopie ist ein Fehler "
-#~ "aufgetreten.<br> Der Fehler lautet: <br>{0}</html>"
-
-#~ msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Beim Speichern ist ein Fehler aufgetreten. <br>Der Fehler lautet: "
-#~ "<br>{0}</html>"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>Die Lesezeichen konnten nicht gelesen werden.<br>{0}</html>"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Die Lesezeichen konnten aus Sicherheitsgründen nicht von ''{0}'' geladen "
-#~ "werden. Die Ausnahme lautet: {1}"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?"
-
-#~ msgid "Confirmation"
-#~ msgstr "Bestätigung"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Lösche Ebene {0} von {1}"
-
-#~ msgid "Delete all"
-#~ msgstr "Alle löschen"
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Warnung: auf das Verzeichnis ''{0}'' konnte aus Sicherheitsgründen nicht "
-#~ "zugegriffen werden. Die Ausnahme lautet: {1}"
-
-#~ msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Beim Speichern ist ein Fehler aufgetreten.<br>Der Fehler lautet: "
-#~ "<br>{0}</html>"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Es kann nicht gesucht werden, da keine Daten geladen sind."
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Beim Wiederherstellen der Sicherheitskopie ist ein Fehler "
-#~ "aufgetreten.<br>Der Fehler lautet: <br>{0}</html>"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikte beim Herunterladen"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Dateiendung unbekannt: {0}"
-
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr "Beim Speichern ist ein Fehler aufgetreten. Der Fehler ist: {0}"
-
-#~ msgid "No, don't apply"
-#~ msgstr "Nicht übernehmen"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr ""
-#~ "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Objekte für gewählte Relationselemente auswählen"
-
-#~ msgid "Could not export \"{0}\""
-#~ msgstr "Kann \"{0}\" nicht exportieren"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Erwartete eine Instanz von OsmDataLayer. Erhielt ''{0}''."
-
-#~ msgid "Unknown relation member type {0}"
-#~ msgstr "Unbekannter Relationselementtyp {0}"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the current projection to one of the cadastre\n"
-#~ "projection and retry"
-#~ msgstr ""
-#~ "Um das Kataster-WMS-Plugin zu aktivieren, ändern Sie die JOSM-Projektion "
-#~ "auf eine der Katasterprojektionen und starten neu."
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Bitte wählen Sie die zu justierende WMS-Ebene."
-
-#~ msgid "Select WMS layer"
-#~ msgstr "WMS-Ebene wählen"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Konnte Lesezeichen nicht schreiben.<br>{0}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem "
-#~ "löschen?"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>Diese Relation wurde außerhalb des Editors verändert.<br>Es ist "
-#~ "nicht möglich, die Änderungen zu übernehmen und die Bearbeitung "
-#~ "fortzusetzen.<br><br>Soll ein Konflikt erstellt und der Editor "
-#~ "geschlossen werden?</html>"
-
-#~ msgid "Fetching a package of {0} from ''{1}''"
-#~ msgstr "Hole ein Paket{0} von ''{1}''"
-
-#~ msgid "Fetching {0} with id {1} from ''{2}''"
-#~ msgstr "Hole {0} mit id {1} von ''{2}''"
-
-#~ msgid ""
-#~ "Failed to close changeset {0}, will be closed by server after timeout. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem "
-#~ "timeout durch den Server geschlossen. Die Fehlermeldung war: {1}"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Das Plugin konnte nicht entfernt werden. Möglicherweise ist es bereits "
-#~ "deaktiviert."
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Der Sicherheitskontext erlaubt keine Verbindung zum "
-#~ "Server<br>''{0}''.<br>Wahrscheinlich haben Sie JOSM als applet gestartet, "
-#~ "und dieses Applet<br>nicht von ''{1}'' geladen.</html>"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. "
-#~ "Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt."
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. "
-#~ "Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Ebene ''{0}'' enthält bereits einen Konflikt für Objekt<br>''{1}''."
-#~ "<br>Dieser Konflikt kann nicht hinzugefügt werden.</html>"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr ""
-#~ "Die folgenden Fehler sind während des kombinierten Herunterladens "
-#~ "aufgetreten:{0}"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Warnung: Die Ebene \"{0}\" existiert nicht mehr. Kann Konflikt für Objekt "
-#~ "\"{1}\" nicht entfernen"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Es existieren momentan keine justierbaren WMS-Ebenen"
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht mehr "
-#~ "benötigt."
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Öffnen einer Verbindung zum entfernten Server<br>''{0}'' "
-#~ "fehlgeschlagen.<br>Hostname \"{1}\" konnte nicht aufgelöst werden."
-#~ "<br>Bitte prüfen Sie die API-URL in den Einstellungen und die "
-#~ "Internetverbindung.</html>"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr ""
-#~ "Der Dialog wurde noch nicht angelegt. Rufen Sie zunächst createInstance() "
-#~ "auf."
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Die Kind-Relation<br>{0}<br> ist auf dem Server gelöscht. Sie kann "
-#~ "nicht geladen werden.</html>"
-
-#~ msgid ""
-#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
-#~ "Exception: {0}"
-#~ msgstr ""
-#~ "Warnung: Dialog für das Auflösen von Konflikten konnte nicht in den "
-#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
-#~ msgstr ""
-#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. "
-#~ "Fehlermeldung ist: {0}"
-
-#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warnung:  Dialog konnte nicht in den Vordergrund gebracht werden. "
-#~ "Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warnung: Dialog für das Editieren von Eigenschaften konnte nicht in den "
-#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
-#~ "was: {0}"
-#~ msgstr ""
-#~ "Warnung: \"Bitte-Warten\"-Dialog konnte nicht in den Vordergrund gebracht "
-#~ "werden. Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. "
-#~ "Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Sie setzen eine leere Rolle für das Relationselement{0}.<br>Damit "
-#~ "löschen Sie die dessen Rolle.<br>Wollen Sie die leere Rolle wirklich "
-#~ "löschen?</html>"
-
-#~ msgid "child.id >0 expected. Got {1}"
-#~ msgstr "Erwarte child.id > 0. Erhielt {1}"
-
-#~ msgid ""
-#~ "marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too"
-#~ msgstr ""
-#~ "Der Weg {0} mit {1} Knoten wurde als unvollständig markiert weil "
-#~ "mindestens einer der referenzierten Knoten nicht in den geladenen Daten "
-#~ "enthalten war."
-
-#~ msgid ""
-#~ "Warning: failed to put history browser always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warnung: Dialog für die Geschichte von Elementen konnte nicht in den "
-#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}"
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>Ein Element dieser Relation entspricht der Relation selbst."
-#~ "<br>Dadurch entsteht eine zirkuläre Abhängigkeit, die zu vermeiden ist."
-#~ "<br>Wie möchten Sie die zirkuläre Abhängigkeit behandeln?</html>"
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Lambertkoordinaten eingeben"
-
-#~ msgid "Click second Lambert crosspiece for georeferencing\n"
-#~ msgstr "Klicke zur Georeferenzierung auf das zweite Lambert-Kreuz.\n"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} bearbeitetes Objekt:"
-#~ msgstr[1] "{0} bearbeitete Objekte:"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Versionskonflikte für Relation {0} auflösen"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Versionskonflikte für Weg {0} auflösen"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Versionskonflikte für Knoten {0} auflösen"
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter \"{0}\" darf nicht leer sein"
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "Kein geöffnetes Changeset vorhanden. Öffne neues Changeset..."
-
-#~ msgid "Reusing existing changeset {0}"
-#~ msgstr "Changeset {0} wiederverwenden"
-
-#~ msgid "id > 0 expected, got {0}"
-#~ msgstr "id > 0 erwartet, aber {0} erhalten"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Den aktuelle Änderungssatz schließen..."
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Neuen Änderungssatz erstellen und geöffnet lassen"
-
-#~ msgid "Close current changeset"
-#~ msgstr "Aktuellen Änderungssatz schließen"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Neuen Änderungssatz erstellen und danach schließen"
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "In einem neuen oder vorhandenen Änderungssatz hochladen?"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "{0} Ebene enthält ungespeicherte Änderungen. Diese Änderungen verwerfen "
-#~ "und fortfahren?"
-#~ msgstr[1] ""
-#~ "{0} Ebenen enthalten ungespeicherte Änderungen. Diese Änderungen "
-#~ "verwerfen und fortfahren?"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WML layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Die Basis-URL<br>''{0}''<br>für diese WMS-Ebene endet weder mit "
-#~ "einem ''&'' noch mit einem ''?''.<br>Wahrscheinlich ist diese WMS-Anfrage "
-#~ "ungültig. Prüfen Sie Ihre Einstellungen.<br>Sollen die WMS-Kacheln "
-#~ "trotzdem heruntergeladen werden?"
-
-#~ msgid "Bikes"
-#~ msgstr "Fahrräder"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr ""
-#~ "<html>Es gibt unbehandelte Konflilte in Ebene \"{0}\".<br>Sie müssen "
-#~ "diese zuerst auflösen.<html>"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Ausgewählte Standardwerte kopieren"
-
-#~ msgid ""
-#~ "<html>An upload and/or save operation of one layer with "
-#~ "modifications<br>was cancelled or has been failed.</html>"
-#~ msgstr ""
-#~ "<html>Ein Hochlade- und/oder Speichervorgang einer Ebene mit "
-#~ "Modifikationen<br>wurde abgebrochen oder ist fehlgeschlagen.</html>"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Speichern und Löschen"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Es gibt momentan keinen offenen Änderungssatz."
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "Auswählen, um in einen neuen Änderungssatz hochzuladen und den "
-#~ "Änderungssatz dann zu schließen"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den "
-#~ "Änderungssatz dann zu schließen"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "Vorhandenen Änderungssatz {0} verwenden und geöffnet lassen"
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Änderungssatz \"{0}\" konnte auf dem OSM-Server \"{1}\" nicht "
-#~ "geschlossen werden.<br>Der Änderungssatz wird vom Server nach einem "
-#~ "Zeitablauf automatisch geschlossen.</html>"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong>"
-#~ msgstr ""
-#~ "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong> von "
-#~ "<strong>{2}</strong> im Änderungssatz <strong>{3}</strong>"
-
-#~ msgid "Changeset {0} is unchanged. Skipping update."
-#~ msgstr "Änderungssatz {0} ist unverändert. Aktualisierung überspringen."
-
-#~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
-#~ msgstr ""
-#~ "Achtung: Vorhandener Änderungssatz konnte nicht weiter verwendet werden. "
-#~ "Neuer wird geöffnet."
-
-#~ msgid "Closing changeset {0}..."
-#~ msgstr "Änderungssatz {0} schließen..."
-
-#~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the "
-#~ "id of the current changeset is 0"
-#~ msgstr ""
-#~ "Aktualisierung des Änderungssatzes fehlgeschlagen. Entweder es existiert "
-#~ "kein vorhandener Änderungssatz oder die ID des aktuellen Änderungssatzes "
-#~ "ist 0."
-
-#~ msgid "Leaving changeset {0} open..."
-#~ msgstr "Änderungssatz {0} geöffnet lassen..."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Die Auswahl \"{0}\" wird von der Relation \"{1}\" in der Rolle {2} "
-#~ "verwendet.<br>Aus Relation entfernen?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Die Auswahl \"{0}\" wird von der Relation \"{1}\" verwendet.<br>Aus "
-#~ "Relation entfernen?</html>"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "Warnung: Nur die ersten {0} von {1} markierten Elementen werden im "
-#~ "Browser angezeigt."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "zu {0} Objekt"
-#~ msgstr[1] "zu {0} Objekten"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Ausgewählte Objekte mit einer anderen Ebene verbinden"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt."
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Um Ihre lokale Version zu behalten muss JOSM die ID des Objekts {0} "
-#~ "auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine neue ID "
-#~ "zuweisen.<br>Möchten Sie fortfahren?</html>"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Objekte auswählen, die dieser Nutzer eingetragen hat"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM wird das Objekt {0} im lokalen Datensatz löschen.<br>Sind Sie "
-#~ "damit einverstanden?</html>"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Mehrere Elemente verweisen auf das gleiche Objekt"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Das Objekt <br>{0}<br>ist bereits in der Relation enthalten."
-#~ "<br><br>Wollen Sie es ein weiteres Mal in die Relation aufnehmen?</html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Ebene ''{0}'' enthält bereits einen Konflikt für das "
-#~ "Element<br>''{1}''.<br>Bitte lösen Sie diesen Konflikt zunächst auf.</"
-#~ "html>"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Objekte zum Hochladen vorbereiten..."
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Typ ist "
-#~ "daher unklar."
-
-#~ msgid "Layer ''{0}'' has no modifications to be saved"
-#~ msgstr "Ebene \"{0}\" enthält keine Modifikationen zum Speichern"
-
-#~ msgid "Layer ''{0}'' has no modifications to be uploaded"
-#~ msgstr "Ebene \"{0}\" enthält keine Modifikationen zum Hochladen"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Merkmale ({0} Konflikte)"
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "Der Schlüssel \"{0}\" und alle dazugehörigen Werte werden entfernt"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den "
-#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr ""
-#~ "Vorhandenen Änderungssatz {0} verwenden und nach dem Hochladen schließen"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Auswählen, um in einen neuen Änderungssatz hochzuladen und den "
-#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Eltern des Objekts {2} laden"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Warnung: Der Wert des Merkmals \"{0}\" des gelöschten Objekts {1} wird "
-#~ "automatisch abgeschnitten"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Ungültiger Kommentar"
-
-#~ msgid "brown"
-#~ msgstr "braun"
-
-#~ msgid "black"
-#~ msgstr "schwarz"
-
-#~ msgid "white"
-#~ msgstr "weiß"
-
-#~ msgid "blue"
-#~ msgstr "blau"
-
-#~ msgid "red"
-#~ msgstr "rot"
-
-#~ msgid "create new objects"
-#~ msgstr "Erstelle neue Objekte"
-
-#~ msgid ""
-#~ "preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
-#~ msgstr ""
-#~ "Voreinstellung des Schlüssels \"{0}\" enthält \"{1}\" nicht. Fenstergröße "
-#~ "kann nicht aus den Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "Warning: failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Achtung: Fenstergröße konnte nicht vom Schlüssel \"{0}\" geladen werden. "
-#~ "Es werden die Standardeinstellungen genutzt. Details: {1}"
-
-#~ msgid ""
-#~ "preference with key ''{0}'' doesn''t exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "Voreinstellung des Schlüssels \"{0}\" existiert nicht. Fenstergröße kann "
-#~ "nicht aus den Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to "
-#~ "version 0.6"
-#~ msgstr ""
-#~ "Achtung: Für die Übertragung ist keine API-Version definiert. Es wird "
-#~ "daher Version 0.6 benutzt."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "Achtung: Voreinstellung \"{0}\" oder API-Version \"{1}\" des Datensatzes "
-#~ "benötigen eine Übertragung der Änderungen. Dies wird ignoriert, da die "
-#~ "Server-API es nicht versteht."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Es gibt ungelöste Konflikte in der Ebene \"{0}\",<br>welche zuerst "
-#~ "gelöst werden müssen.</html>"
-
-#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
-#~ msgstr "Nicht unterstützter Wert \"{0}\" oder Parameter \"{1}\"."
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "Parameter \"{0}\" darf nucht Null sein."
-
-#~ msgid "version > 0 expected. Got {0}"
-#~ msgstr "Version > 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "expected id >= 0. Got {0}"
-#~ msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "id > 0 expected. Got {0}"
-#~ msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Konflikte beim Zusammenführen der Knoten. Neuer Knoten ist \"{0}\""
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Bitte entscheide, welche Werte behalten werden sollen."
-
-#~ msgid "not yet decided"
-#~ msgstr "Noch ohne Lösung"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr ""
-#~ "Ersetze den Weg in den zugehörigen Relationen durch den neuen verbundenen "
-#~ "Weg."
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} Ebene sollte gespeichert werden, jedoch ist die<br>zugehörige "
-#~ "Datei schreibgeschützt.<br>Wähle eine andere Datei aus oder verwerfe die "
-#~ "Änderungen.<br>Ebene mit schreibgeschützter Datei:</html>"
-#~ msgstr[1] ""
-#~ "<html>{0} Ebenen sollten gespeichert werden, jedoch sind "
-#~ "die<br>zugehörigen Dateien schreibgeschützt.<br>Wähle andere Dateien aus "
-#~ "oder verwerfe die Änderungen.<br>Ebenen mit schreibgeschützten Dateien:</"
-#~ "html>"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr ""
-#~ "Knoten \"{0}\" konnte nicht zu unvollständigem Weg \"{1}\" hinzufügt "
-#~ "werden."
-
-#~ msgid "child.getId() >0 expected. Got {1}"
-#~ msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong> von "
-#~ "<strong>{2}</strong> im Änderungssatz <strong>{3}</strong></html>"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>Fehler beim Erstellen der URL, da die Kodierung \"{0}\"<br>auf "
-#~ "diesem System nicht verfügbar ist.</hml>"
-
-#~ msgid "Missing attribute ''ref'' on member in relation {0}"
-#~ msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
-
-#~ msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-#~ msgstr ""
-#~ "Ungültiger Wert des Attributs \"ref\" im Element <nd>. Wert lautete {0}"
-
-#~ msgid "Missing attribute ''type'' on member {0} in relation {1}"
-#~ msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}"
-
-#~ msgid "Unknown or unsupported API version. Got {0}"
-#~ msgstr ""
-#~ "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
-
-#~ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr ""
-#~ "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
-
-#~ msgid "Set "
-#~ msgstr "Festlegen "
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-#~ msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\""
-
-#~ msgid ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-#~ msgstr ""
-#~ "Merkmalsammlung konnte nicht auf ein Objekt angewendet werden,  da sie "
-#~ "Schlüssel mit mehreren Werten enthält"
-
-#~ msgid ""
-#~ "way with external id ''{0}'' includes missing node with external id "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "Der Weg mit der externen ID ''{0}'' enthält einen Knoten mit externer ID "
-#~ "''{1}'', der im Datenstrom nicht gefunden wurde."
-
-#~ msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-#~ msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt"
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''"
-#~ msgstr ""
-#~ "Die Relation mit externer ID ''{0}'' referenziert ein nicht vorhandendes "
-#~ "OSM Element mit externer ID ''{1}''"
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-#~ msgstr ""
-#~ "Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit "
-#~ "externer ID ''{1}''"
-
-#~ msgid ""
-#~ "failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "Das Feld \"{1}\" in den Einstellungen mit Schlüssel \"{0}\" konnte nicht "
-#~ "ausgelesen werden. Der Fehler war: {2}. Fenstergröße kann nicht aus den "
-#~ "Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "preference with key ''{0}'' doesn''t provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "Einstellung mit Schlüssel \"{0}\" liefert keine Ganzzahl für \"{1}\", "
-#~ "sondern {2}. Fenstergröße kann nicht aus den Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr ""
-#~ "Warnung: Ignoriere Fehlermedlung, da der zugrundeliegende Vorgang "
-#~ "abgebrochen wurde. Die Fehlermeldung lautete: "
-
-#~ msgid ""
-#~ "Layer ''{0}'' has modifications which should be saved to its assoicated "
-#~ "file ''{1}''."
-#~ msgstr ""
-#~ "Ebene \"{0}\" enthält Änderungen, die in der verknüpften Datei \"{1}\" "
-#~ "gespeichert werden sollten."
-
-#~ msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-#~ msgstr ""
-#~ "Parameter \"{0}\" mit Merkmalen für genau einen Schlüssel wurde erwartet. "
-#~ "Erhaltener Wert {1}"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "Merkmalssammlung enthält nicht den gewählten Wert \"{0}\""
-
-#~ msgid "Missing mandatory attribute ''{0}''"
-#~ msgstr "Fehlendes obligatorisches Attribut \"{0}\""
-
-#~ msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-#~ msgstr "Fehlendes obligatorisches Attribut \"{0}\" des XML-Elements {1}"
-
-#~ msgid "Found XML element <member> not as direct child of element <relation>"
-#~ msgstr ""
-#~ "XML-Element <member> wurde nicht als direktes Kind des Elements "
-#~ "<relation> gefunden"
-
-#~ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-#~ msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf <nd> des Wegs {1}"
+#~ "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
 #~ msgid ""
 #~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Fehlendes obligatorisches Attribut des \"bounds\"-Elements. Eingelesen "
-#~ "wurde minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', "
-#~ "origin=''{5}''"
-
-#~ msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
+#~ "Notwendiges Attribut des XML-Elements ''bounds'' fehlt. Erhielt "
+#~ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', "
+#~ "origin=''{5}''."
+
+#~ msgid "Changeset"
+#~ msgstr "Änderungssatz"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Warnung: Undefiniertes Element \"{0}\" im Eingabestream gefunden. Wird "
-#~ "übersprungen."
-
-#~ msgid "pos {0} is out of range. current number of members: {1}"
+#~ "Warnung: unerwartete Versionsnummer für JOSM in der Versions-Datei, der "
+#~ "Wert ist ''{0}''"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "pos {0} außerhalb des Wertebereiches. Aktuelle Mitgliederanzahl: {1}"
+#~ "Warnung: Fehler beim Öffnen der Ressource ''/data/{0}''. Kann das NTF<-"
+#~ ">RFG93-Gitter nicht laden."
 
 #~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "<b>Zoomen:</b> Mausrad, Doppelklick oder Strg + Hoch/Runter <b>Karte "
-#~ "verschieben:</b> Rechte Maustaste gedrückt halten und Maus bewegen oder "
-#~ "Pfeiltasten verwenden. <b>Auswählen:</b> Linke Maustaste gedrückt halten "
-#~ "und Rahmen aufziehen."
-
-#~ msgid "near"
-#~ msgstr "In der Nähe von"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Man-Made"
-#~ msgstr "Zivilisationsbauten"
-
-#~ msgid "Travel"
-#~ msgstr "Reisen"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ "<html>Es sind <strong>mehrere Änderungssätze</strong> notwendig, um {0} "
+#~ "Objekte hochzuladen. Welche Vorgehensweise wollen Sie benutzen?</html>"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Server-Koordinaten behalten"
+
+#~ msgid ""
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> Sprache erstellen."
+#~ "Es trat ein Fehler beim Einlesen der GPX-Datei \"{0}\" auf. Datei wird "
+#~ "nur teilweise verwendet."
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hilfeseite fehlt. In <A HREF=\"{0}\">englischer</A> oder <A HREF="
-#~ "\"{1}\">deutscher</A> Sprache erstellen."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene "
-#~ "\"{1}\" nicht mehr existiert."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Konnte kein Objekt mit ID {0} im Datensatz finden"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Die Basis-URL<br>''{0}''<br>für diese WMS-Ebene endet weder mit "
-#~ "einem ''&'' noch mit einem ''?''.<br>Wahrscheinlich ist diese WMS-Anfrage "
-#~ "ungültig. Prüfen Sie Ihre Einstellungen.<br>Sollen die WMS-Kacheln "
-#~ "trotzdem heruntergeladen werden?"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Neuen Änderungssatz öffnen"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Alle Änderungen in einer Anfrage hochladen"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Offenen Änderungssatz verwenden"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Daten in einen vorhandenen, offenen Änderungssatz hochladen"
-
-#~ msgid "current changeset is null. Can't upload data."
-#~ msgstr "Aktueller Änderungssatz ist leer. Keine Daten zum Hochladen."
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "ID des Änderungssatzes > 0 erwartet. Erhaltener Wert {0}"
-
-#~ msgid "parameter ''{0}'' > 0 expected. Got {1}"
-#~ msgstr "Parameter ''{0}'' > 0 erwartet. Erhaltener Wert {1}"
-
-#~ msgid "changeset id > 0 expected. Got {1}"
-#~ msgstr "Änderungssatznummer > 0 erwartet. Erhaltener Wert {1}"
-
-#~ msgid "Changeset id > 0 expected. Got {0}"
-#~ msgstr "Änderungssatznummer > 0 erwartet. Erhaltener Wert {0}"
-
-#~ msgid "illegal value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "Ungültiger Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
-
-#~ msgid "Open changeset expected. Got closed changeset with id {0}"
-#~ msgstr ""
-#~ "Offener Änderungssatz erwartet, aber geschlossenen mit Nummer {0} erhalten"
-
-#~ msgid "missing mandatory attribute ''{0}''"
-#~ msgstr "Fehlendes obligatorisches Attribut \"{0}\""
-
-#~ msgid "XML tag <user> is missing"
-#~ msgstr "XML-Tag <user> fehlt"
-
-#~ msgid "Via node {0}, {1}"
-#~ msgstr "Via Knoten {0}, {1}"
-
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} via-Knoten"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>Hochladen <strong>fehlgeschlagen</strong>! Der verwendete "
-#~ "Änderungssatz {0}<br> wurde bereits zur Zeit {1} geschlossen.<br>Bitte "
-#~ "laden Sie mit einem neuen oder existierenden offenen Änderungsatz erneut "
-#~ "hoch."
-
-#~ msgid "History item"
-#~ msgstr "Versionsprotokoll-Eintrag"
-
-#~ msgid "History of Element"
-#~ msgstr "Versionsprotokoll des Elements"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "Keine \"neueste\" Version gefunden. Versionsprotokoll ist leer."
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Es gibt kein Objekt mit der Version \"{0}\" im Versionsprotokoll."
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr ""
-#~ "Es wurde kein Objekt im Versionsprotokoll für das Datum {0} gefunden."
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "Keine \"älteste\" Version gefunden. Versionsprotokoll ist leer."
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr ""
-#~ "Das Versionsprotokoll ist noch nicht initialisiert. Fehler beim Erstellen "
-#~ "des aktuellen Objekts."
-
-#~ msgid ""
-#~ "failed to set reference. reference id {0} doesn't match history id {1}"
-#~ msgstr ""
-#~ "Fehler beim Setzen der Referenz. Referenz-ID {0} stimmt nicht mit der ID "
-#~ "'{1}' des Versionsprotokolls überein"
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr ""
-#~ "Fehler beim Erstellen des Referenzelements. Version {0} der Referenz ist "
-#~ "im Versionsprotokoll nicht vorhanden."
-
-#~ msgid "failed to set current. current version {0} not available in history"
-#~ msgstr "Aktuelle Version {0} nicht im Versionsprotokoll vorhanden."
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "Das Versionsprotokoll ist noch nicht initialisiert. Fehler beim Erstellen "
-#~ "des Referenzobjekts."
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Versionsprotokoll des ausgewählten Objekts anzeigen"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Hochladen <strong>fehlgeschlagen</strong>, da der "
-#~ "verwendete<br>Änderungssatz {0} bereits am {1} geschlossen wurde."
-#~ "<br>Bitte in einen neuen oder in einen vorhandenen, offenen Änderungssatz "
-#~ "hochladen.</html>"
-
-#~ msgid "H"
-#~ msgstr "S"
-
-#~ msgid "D"
-#~ msgstr "L"
-
-#~ msgid "R"
-#~ msgstr "E"
-
-#~ msgid "A"
-#~ msgstr "H"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "C"
-#~ msgstr "K"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''"
-#~ msgstr ""
-#~ "Warnung: Ebene \"{0}\" existiert nicht mehr. Konflikt für Objekt \"{1}\" "
-#~ "konnte nicht entfernt werden."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Auch auf Kinder anwenden"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Vorlagengruppe \"{0}\" aus Gruppe ''{1}''"
-
-#~ msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr ""
-#~ "Ungültiger boolescher Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
-
-#~ msgid "id of current changeset > 0 required. Current id is {0}"
-#~ msgstr ""
-#~ "ID des aktuellen Änderungssatzes > 0 erwartet. Aktuelle ID lautet {0}"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr ""
-#~ "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden."
-
-#~ msgid "All:"
-#~ msgstr "Vollständig:"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural ""
-#~ "_: gps\n"
-#~ "tracks"
-#~ msgstr[0] "GPS-Spur"
-#~ msgstr[1] "GPS-Spuren"
-
-#~ msgid "{0} extrem nodes."
-#~ msgstr "{0} extreme Knoten."
-
-#~ msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
-#~ msgstr "Fehlendes Attribut \"{0}\" im XML-Tag \"{1}\""
-
-#~ msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
-#~ msgstr ""
-#~ "Ungültiger Wert für Attribut \"{0}\" im XML-Tag \"{1}\". Erhaltener Wert "
-#~ "{2}"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr ""
-#~ "Bei der Suche nach \"{0}\" konnte nichts in der Auswahl gefunden werden."
-
-#~ msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "Ungültiger numerischer Wert \"{1}\" für das Attribut \"{0}\"."
-
-#~ msgid "Processing {0}"
-#~ msgstr "{0} verarbeiten"
-
-#~ msgid "MIddle way: {0}"
-#~ msgstr "Mittlerer Weg: {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Ungültiger Wert für Attribut \"version\" bei OSM-Objekt mit ID {0}. "
-#~ "Erhaltener Wert {1}"
-
-#~ msgid "Relation: from {0} to {1} via {2}"
-#~ msgstr "Relation: von {0} über {2} nach {1}"
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr "Gruppiert bekannte Adressinterpolation in einem Dialogfenster."
-
-#~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
-#~ "API version is ''0.5''. Got {1}"
-#~ msgstr ""
-#~ "Achtung: Die Version des Elementes \"{0}\" wurde auf den Ausgangswert "
-#~ "\"0\" gesetzt, da ein fehlerhafter Wert von \"{1}\" gelesen wurde. (API-"
-#~ "Version \"0.5\")"
-
-#~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
-#~ "API version is ''0.6''. Got {1}"
-#~ msgstr ""
-#~ "Achtung: Die Version des Elementes \"{0}\" wurde auf den Ausgangswert "
-#~ "\"0\" gesetzt, da ein fehlerhafter Wert von \"{1}\" gelesen wurde. (API-"
-#~ "Version \"0.6\")"
-
-#~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, "
-#~ "API version is ''0.5''. Got {1}"
-#~ msgstr ""
-#~ "Achtung: Die Version des Elementes \"{0}\" wurde auf den Ausgangswert "
-#~ "\"1\" gesetzt, da ein fehlerhafter Wert von \"{1}\" gelesen wurde. (API-"
-#~ "Version \"0.5\")"
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr ""
-#~ "Fehler: Anmeldedaten konnten nicht zur Verbindung hinzugefügt werden."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "Unerwarteter Rückgabewert: {0}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-"
-#~ "Name."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr ""
-#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige "
-#~ "Klasse."
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr ""
-#~ "Es gibt kein Objekt mit der Version \"{0}\" in der Objekt-Geschichte."
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Es wurde kein Objekt in der Geschichte für das Datum {0} gefunden."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID "
-#~ "\"{1}\" verglichen werden"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht "
-#~ "ausgeführt werden."
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})."
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "Merkmalssammlung enthält nicht den gewählten Wert \"{0}\""
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "Tabellenindex außerhalb der Grenzen ({0})"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "History der markierten Elemente anzeigen"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Kann \"{0}\" nicht lesen"
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Typ ist "
-#~ "daher unklar."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element"
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren."
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr ""
-#~ "Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit "
-#~ "externer ID ''{1}''"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
-#~ "Internetverbindung."
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "Achtung: Voreinstellung \"{0}\" oder API-Version \"{1}\" des Datensatzes "
-#~ "benötigen eine Übertragung der Änderungen. Dies wird ignoriert, da die "
-#~ "Server-API es nicht versteht."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
-#~ msgstr ""
-#~ "Voreinstellung des Schlüssels \"{0}\" enthält \"{1}\" nicht. Fenstergröße "
-#~ "kann nicht aus den Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "Einstellung mit Schlüssel \"{0}\" liefert keine Ganzzahl für \"{1}\", "
-#~ "sondern {2}. Fenstergröße kann nicht aus den Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "Das Feld \"{1}\" in den Einstellungen mit Schlüssel \"{0}\" konnte nicht "
-#~ "ausgelesen werden. Der Fehler war: {2}. Fenstergröße kann nicht aus den "
-#~ "Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "Voreinstellung des Schlüssels \"{0}\" existiert nicht. Fenstergröße kann "
-#~ "nicht aus den Einstellungen geladen werden."
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Achtung: Fenstergröße konnte nicht vom Schlüssel \"{0}\" geladen werden. "
-#~ "Es werden die Standardeinstellungen genutzt. Details: {1}"
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr ""
-#~ "Ungültiger numerischer Wert für das Attribut ''{0}''. Erhielt den Wert "
-#~ "''{1}''."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "WARNUNG: Ebene ''{0}'' existiert nicht mehr. Der Konflikt für das Objekt "
-#~ "''{1}'' kann nicht entfernt werden."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr ""
-#~ "Nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "Der Parameter \"{0}\" muss im Bereich 0 bis {1} liegen, ist aber \"{2}\"."
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "Der Weg mit der ID {0} wird als unvollständig markiert, weil mindestens "
-#~ "einer seiner {1} Knoten in den geladenen Daten fehlt."
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "{0} Objekte wurden entfernt"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Das Kommando ''{0}'' kann nicht rückgängig gemacht werden, weil die Ebene "
-#~ "''{1}'' nicht mehr vorhanden ist."
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Entferne einen Verweis der Relation {0}"
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} Objekt wurde aus den lokalen Daten entfernt, weil es auf dem Server "
-#~ "bereits gelöscht ist."
-#~ msgstr[1] ""
-#~ "{0} Objekte wurden aus den lokalen Daten entfernt, weil sie auf dem "
-#~ "Server bereits gelöscht sind."
-
-#~ msgid "underwater"
-#~ msgstr "Unter Wasser"
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Anpassbare Komponente {0} ist noch nicht registriert. Sie kann nicht am "
-#~ "synchronen Anpassen teilnehmen."
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
-#~ "update, or delete. Either the respective object<br>doesn''t exist on the "
-#~ "server or you''re using an invalid URL to access<br>it. Please carefully "
-#~ "check the servers address ''{1}'' for typos."
-#~ msgstr ""
-#~ "Der OSM-Server ''{0}'' kennt ein Objekt nicht, das Sie lesen, verändern "
-#~ "oder löschen wollten.<br> Es existiert entweder nicht auf dem Server oder "
-#~ "Sie benutzen eine ungültige URL,<br> um auf den Server zuzugreifen. "
-#~ "<br>Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. "
-#~ "Überspringe dieses Objekt und fahre mit dem Hochladen fort."
-
-#~ msgid "tower"
-#~ msgstr "Turm"
-
-#~ msgid "overground"
-#~ msgstr "oberirdisch"
-
-#~ msgid "line"
-#~ msgstr "Freileitung (Starkstrom)"
-
-#~ msgid "any substance"
-#~ msgstr "Beliebige Substanz"
-
-#~ msgid "Tag modified relations with   "
-#~ msgstr "Kennzeichnen der geänderten Relationen mit   "
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Sie sind dabei {0} Browserfenster zu erzeugen.<br>Dies kann Ihren "
-#~ "Bildschirm mit Browserfenstern<br>überfüllen und benötigt einige Zeit."
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "Keine \"älteste\" Version gefunden. Es existiert keine Geschichte."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "Keine \"neueste\" Version gefunden. Es existiert keine Geschichte."
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "Typ nicht gefunden. Es existiert keine Geschichte."
-
-#~ msgid "latitude"
-#~ msgstr "Breitengrad"
-
-#~ msgid "longitude"
-#~ msgstr "Längengrad"
-
-#~ msgid "Coordinate"
-#~ msgstr "Koordinate"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl."
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive "
-#~ "Ganzzahl."
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn''t know about an object<br>you tried to "
-#~ "read, update, or delete. Either the respective object<br>doesn''t exist "
-#~ "on the server or you''re using an invalid URL to access<br>it. Please "
-#~ "carefully check the servers address ''{0}'' for typos."
-#~ msgstr ""
-#~ "Der OSM-Server ''{0}'' kennt ein Objekt, das Sie lesen, verändern oder "
-#~ "löschen wollten nicht.<br> Es existiert entweder nicht auf dem Server "
-#~ "oder Sie benutzen eine ungültige URL,<br> um auf den Server zuzugreifen. "
-#~ "<br>Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "Parameter \"{0}\" mit Merkmalen für genau einen Schlüssel wurde erwartet. "
-#~ "Erhaltener Wert {1}."
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr ""
-#~ "Die Objekte der aktuellen Datenebene mittels des Servers aktualisieren."
-
-#~ msgid "Update selections"
-#~ msgstr "Auswahl aktualisieren"
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Alle Änderungen in der aktuellen Datenebene zum OSM-Server hochladen."
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr "Alle Änderungen in der aktuellen Auswahl zum OSM-Server hochladen."
-
-#~ msgid ""
-#~ "Please consult the Conflict List Dialog<br>and manually resolve them."
-#~ msgstr ""
-#~ "Bitte benutzen Sie die Konfliktanzeige<br>und lösen die Konflikte manuell."
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Objektnummer > 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr ""
-#~ "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ID > 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "Added {0} objects"
-#~ msgstr "{0} Objekte wurden hinzugefügt"
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>Laden des Plugins {0} wurde angefordert.<br>Das Plugin wird nicht "
-#~ "mehr gewartet und es ist sehr wahrscheinlich, dass es Fehler verursacht."
-#~ "<br>Bitte deaktivieren Sie es.<br>Soll es aus den Einstellungen entfernt "
-#~ "werden?</html>"
-
-#~ msgid "Set manually the Lambert zone"
-#~ msgstr "Setzen Sie die Lambert-Zone manuell"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Die Hilfe-Seite unter der URL  {0} konnte nicht geöffnet werden."
-#~ "<br>Vermutlich ist Ihre Internet-Verbindung unterbrochen.</html>"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
-
-#~ msgid "Failed to launch the external help browser"
-#~ msgstr "Der externe Hilfe-Browser konnte nicht geöffnet werden"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr ""
-#~ "Klicken, um zum Relationseditor zurückzukehren und das Editieren der "
-#~ "Relation wiederaufzunehmen"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information.You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Hilfe-Seite für ein Hilfe-Thema fehlt</"
-#~ "p><p class=\"warning-body\">Für das Hilfe-Thema <strong>{0}</strong> ist "
-#~ "noch keine Hilfe-Seite verfügbar. Sie fehlt sowohl in Ihrer lokalen "
-#~ "Sprache ({1}) als auch in Englisch.<br><br>Bitte helfen Sie, das JOSM-"
-#~ "Hilfe-System zu verbessern und tragen Sie die fehlenden Informationen "
-#~ "nach.  Sie können sowohl die <a href=\"{2}\">Hilfe-Seite in ihrer lokalen "
-#~ "Sprache ({1})</a>, als auch die <a href=\"{3}\">Hilfe-Seite in Englisch</"
-#~ "a> editieren.</p></html>"
-
-#~ msgid "Failed to read command. Exiting help browser. Exception was:"
-#~ msgstr ""
-#~ "Ein Kommando konnte nicht gelesen werden. Der Hilfe-Browser wird "
-#~ "geschlossen. Die Fehermeldung war:"
-
-#~ msgid ""
-#~ "<html>The server reported that it has detected a conflict.<br>Error "
-#~ "message (untranslated):<br>{0}"
-#~ msgstr ""
-#~ "<html>Der OSM Server hat einen Konflikt entdeckt.<br>Fehlermeldung (nicht "
-#~ "übersetzt):<br>{0}"
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Sie müssen mindestens zwei Wege auswählen."
-
-#~ msgid "gray"
-#~ msgstr "grau"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Übertrage {0} Objekte zum Server ..."
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Falsche Anzahl an Parametern für Merkmalsoperator."
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Ungültiger Wert für Merkmalsoperator: {0}. Operator erwartet "
-#~ "Merkmalsanzahl oder -bereich, z.B. \"tags: 1\" oder \"tags:2-5\"."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter \"{0}\" darf nicht leer sein"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Ungültiger Gleitkommawert ''{0}''"
-
-#~ msgid "Active styles"
-#~ msgstr "Aktive Stile"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Ein Multipolygon darf nur aus geschlossenen Wegen bestehen."
-
-#~ msgid "Warning: bad location in HTML document. Exception was: "
-#~ msgstr "Warnung: Falsche Position im HTML Dokument. Der Fehler war: "
-
-#~ msgid ""
-#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
-#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n"
-#~ "Upload your changes, close all layers and change\n"
-#~ "manually the Lambert zone from the Cadastre menu"
-#~ msgstr ""
-#~ "Aktuelle Ebene ist in der Lambert CC9 Zone \"{0}\"\n"
-#~ "während sich die Kommune in der Lambert CC9 Zone \"{1}\" befindet.\n"
-#~ "Lade deine Änderungen hinauf, schließe alle Ebenen und ändere\n"
-#~ "manuell die Lambert Zone im Katastermenü"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr ""
-#~ "Laden der Ressource ''{0}'' ist fehlgeschlagen. Die Fehlermeldung ist {1}"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr ""
-#~ "Fehler: Unerwartete Zeile ''{0}'' in der Liste der Lesezeichen vom Server"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -49258,2759 +44781,131 @@
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the target node or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the target node will "
-#~ "take the place of the original node in the membership.</html>"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "<html>Die vereinigten Knoten sind Mitglieder in mindestens einer "
-#~ "Relation. Bitte entscheiden Sie, ob Sie diese Relationen-Mitgliedschaften "
-#~ "<strong>behalten</strong> oder <strong>entfernen</strong> wollen.<br>Die "
-#~ "Grundeinstellung ist <strong>behalten</strong>: der vereinigte Knoten "
-#~ "nimmt den Platz der ursprünglichen Knoten in den Relation-"
-#~ "Mitgliedschaften ein.</html>"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Verfügbare Stile (von {0})"
+#~ "Warnung: Ignoriere Fehlermedlung, da der zugrundeliegende Vorgang "
+#~ "abgebrochen wurde. Die Fehlermeldung lautete: {0}"
 
 #~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Speichern und/oder Hochladen einer Ebene mit veränderten "
+#~ "Daten<br>wurde abgebrochen oder ist fehlgeschlagen.</html>"
+#~ msgstr[1] ""
+#~ "<html>Speichern und/oder Hochladen von {0} Ebenen mit veränderten "
+#~ "Daten<br>wurde abgebrochen oder ist fehlgeschlagen.</html>"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
 #~ msgstr ""
-#~ "<html>Weder <strong>{0}</strong> noch <strong>{1}</strong> ist ausgewählt."
-#~ "<br>Bitte wählen Sie, ob sie OSM-Datenobjekte, GPS-Spuren oder beides "
-#~ "laden wollen.</html>"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} Plugin erfolgreich geladen."
-#~ msgstr[1] "{0} Plugins erfolgreich geladen."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Bitte JOSM neu starten."
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Array der Länge 4 erwartet, aber {0} erhalten"
-
-#~ msgid "At least one object to delete requird, got empty collection"
+#~ "Vorspann des OsmChange-Dokuments noch nicht geschrieben. Bitte zuerst "
+#~ "schreiben."
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Immer ohne Nachfrage aktualisieren"
+
+#~ msgid ""
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Mindestens ein Objekt zum Löschen wurde erwartet, es wurde jedoch eine "
-#~ "leere Menge erhalten"
+#~ "<html>Alternativ können Sie eine <strong>Kacheladresse</strong> für eine "
+#~ "einzelne Kachel im Format <i>zoomlevel/x/y</i> angeben, z.B. "
+#~ "<i>15/256/223</i>. Kacheladressen im Format <i>zoom,x,y</i> oder <i>zoom;"
+#~ "x;y</i> sind ebenfalls gültig.</html>"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Editorfenster für die ausgewählten Abbiegeeinschränkungen öffnen"
+
+#~ msgid "Both"
+#~ msgstr "Beide"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Filtert nicht benötigte GPS-Spuren"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Adressen korrigieren"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "Es wurde eine passende Kalibrierungsdatei gefunden:"
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
+#~ msgstr "In Zukunft werden Kalibrierungsdateien automatisch geladen."
 
 #~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "Objekt {0} kann nicht zum Datensatz hinzugefügt werden, weil es bereits "
-#~ "im Datensatz enthalten ist"
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "Die Zeichenkette ''{0}'' ist kein gültiger Gleitkommawert."
+#~ "(setze \"{0}\" to ja/nein/fragen in den Einstellungen, um das\n"
+#~ "automatische Laden der Kalibrierparameter zu kontrollieren)"
 
 #~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "<html><strong>Aktueller Ladebereich</strong> (min. Breite, min. Länge, "
-#~ "max. Br., max. Län.): {0}, {1}, {2}, {3}</html>"
+#~ "Setze \"{0}\" auf ja/nein/fragen in den Einstellungen für das "
+#~ "automatische Laden von Kalibrierungsdateien."
 
 #~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Fehler: Unzulässiger Gleitkommawert ''{0}'' in der Zeile ''{1}'' der "
-#~ "Liste der Lesezeichen vom Server"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr ""
-#~ "Genau zwei Gleitkommawerte in der Zeichenkette erwartet, jedoch {0} "
-#~ "erhalten"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Füge einen Dateinamen oder eine URL für einen aktiven Stil hinzu"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID "
-#~ "\"{1}\" verglichen werden."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}."
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr ""
-#~ "Beim Zusammenführen wurde das Ziel-Objekt für das Objekt mit ID {0} nicht "
-#~ "gefunden"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Can''t deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das "
-#~ "Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese "
-#~ "Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. "
-
-#~ msgid "User with the same uid but different name found"
-#~ msgstr ""
-#~ "Ein Benutzer mit der gleichen ID aber mit einem unterschiedlichen Namen "
-#~ "wurde gefunden"
-
-#~ msgid ""
-#~ "Can''t merge because either of the participating primitives is new and "
-#~ "the other is not"
-#~ msgstr ""
-#~ "Kann zwei Objekte nicht zusammenführen, weil eines der Objekte neu ist, "
-#~ "das andere aber nicht."
-
-#~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the combined way or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
-#~ "take the place of the original way in the membership.</html>"
-#~ msgstr ""
-#~ "<html>Die vereinigten Wege sind Mitglieder in mindestens einer Relation. "
-#~ "Bitte entscheiden Sie, ob Sie die entsprechenden "
-#~ "Relationsmitgliedschaften <strong>behalten</strong> oder "
-#~ "<strong>entfernen</strong> wollen.<br>Der Standardwert ist "
-#~ "<strong>behalten</strong>: der vereinigte Weg wird den Platz der "
-#~ "ursprünglichen Wege in den Relationsmitgliedschaften einnehmen.</html>"
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
-#~ msgstr ""
-#~ "Sie haben eine neue Version der JOSM-Software installiert.\n"
-#~ "Um Probleme zu vermeiden, sollten Sie auch Ihre Plugins aktualisieren.\n"
-#~ "Sollen die Plugins jetzt erneuert werden?"
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "Zwei Objekte mit unterschiedlichen IDs können nicht zusammengeführt "
-#~ "werden. Die ID des Objekts ist {0}, die ID des anderen {1}"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Min. Zoomstufe: "
-
-#~ msgid "Unconnceted coastline"
-#~ msgstr "Nicht verbundene Küstenlinie"
-
-#~ msgid "null detected in node list"
-#~ msgstr "Nullwert in Knotenliste entdeckt"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Frankreich)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20-Nord Geodätisches System"
-
-#~ msgid "Downloading relation ''{0}''"
-#~ msgstr "Relation ''{0}'' herunterladen"
-
-#~ msgid "Could not create a node with the entered latitude/longitude."
-#~ msgstr ""
-#~ "Knoten mit eingegebenen Werten für Länge und Breite konnte nicht erstellt "
-#~ "werden.."
-
-#~ msgid "Illegal lat/lon value"
-#~ msgstr "Ungültiger Wert für Länge oder Breite"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Vollbildanzeige"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Vollbilddarstellung umschalten"
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "Verfügbare Übersetzungen suchen..."
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Bitte eine gültige Breite im Bereich -90..90 eingeben"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Bitte eine Breite im Bereich -90..90 eingeben"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Bitte eine gültige Länge im Bereich -180..180 eingeben"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Bitte eine Länge im Bereich -180..180 eingeben"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Dialog schließen, keinen neuen Knoten anlegen"
-
-#~ msgid ""
-#~ "<html><p>You've encountered an error in JOSM. Before you file a "
-#~ "bug<br>make sure you've updated to the latest version of JOSM here:</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Sie haben einen Fehler in JOSM gefunden. Bevor Sie einen "
-#~ "Fehlerbericht<br> erstellen, stellen Sie sicher, dass Sie die aktuelle "
-#~ "Version von JOSM nutzen:</p></html>"
-
-#~ msgid ""
-#~ "<html>You should also update your plugins. If neither of those help "
-#~ "please<br>file a bug in our bugtracker using this link:</p></html>"
-#~ msgstr ""
-#~ "<html>Sie sollten auch die Plugins aktualisieren. Falls das alles nicht "
-#~ "hilft, erstellen<br> Sie bitte mit folgendem Link einen Fehlerbericht:</"
-#~ "p></html>"
-
-#~ msgid ""
-#~ "<html><p>There the the error information provided below should already "
-#~ "be<br>filled out for you. Please include information on how to "
-#~ "reproduce<br>the error and try to supply as much detail as possible.</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Die unten angezeigten Fehlerdaten sollten bereits vorausgefüllt "
-#~ "sein.<br>Bitte ergänzen Sie Informationen, wie der Fehler zu "
-#~ "reproduzieren ist.<br>Erwähnen Sie so viele Details wie möglich.</p></"
-#~ "html>"
-
-#~ msgid "You've encountered a bug in JOSM"
-#~ msgstr "Sie haben einen Fehler in JOSM gefunden"
-
-#~ msgid "Loading available locales..."
-#~ msgstr "Verfügbare Übersetzungen suchen..."
-
-#~ msgid "Checking locales..."
-#~ msgstr "Übersetzungen prüfen..."
-
-#~ msgid "Checking translation for locale ''{0}''"
-#~ msgstr "Übersetzung für Sprache ''{0}'' prüfen"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>Die Daten in der GPS-Ebene ''{0}'' wurden vom Server "
-#~ "heruntergeladen.<br>Da die Wegpunkte keine Zeitstempel enthalten, können "
-#~ "sie auch nicht mit Bildern verknüpft werden.</html>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>Die Daten in der GPS-Ebene ''{0}'' wurden vom Server "
-#~ "heruntergeladen.<br>Da die Wegpunkte keine Zeitstempel enthalten, können "
-#~ "sie auch nicht mit Audiodaten verknüpft werden.</html>"
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: Relation ''{2}'' herunterladen..."
-
-#~ msgid "({0}/{1}) Uploading {2} objects..."
-#~ msgstr "({0}/{1}) {2} Objekte hochladen..."
-
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Altes Plugin {0} entfernen"
-
-#~ msgid "Plugin {0} is no longer necessary and has been deactivated."
-#~ msgstr "Plugin {0} wird nicht mehr benötigt und wurde deaktiviert."
-
-#~ msgid "Delete old plugin file {0}"
-#~ msgstr "Alte Plugindatei {0} entfernen"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet."
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "Passwort Ihres OSM-Zugangs eingeben"
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Authentifizierung beim HTTP-Proxy ''{0}'' schlug fehl . Bitte "
-#~ "gültigen Benutzernamen und Passwort eingeben.</html>"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Fehlende rechte Klammer"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Offen"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Geschlossen"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Kann Verzeichnis nicht öffnen.<br>Bitte eine Datei auswählen!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Öffne {0} Dateien..."
-
-#~ msgid "Uploading {0} objects..."
-#~ msgstr "{0} Objekte hochladen..."
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Die 'Modifiziert'-Eigenschaft für die Relation {0} setzen"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Die 'Modifiziert'-Eigenschaft für den Weg {0} setzen"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Die 'Modifiziert'-Eigenschaft für den Knoten {0} setzen"
-
-#~ msgid "Display the the tags of the changeset"
-#~ msgstr "Die Merkmale des Änderungssatzes anzeigen"
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Ungültiger Wert für Versionsoperator: {0}. Eine Zahl wurde erwartet."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Parameter ''{0}'' größer gleich 0 erwartet, aber {1} erhalten."
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Ungültiger Wert für Änderungssatzoperator: {0}. Eine Zahl wurde erwartet."
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr ""
-#~ "Den Versionsverlauf der gewählten Objekte herunterladen und anzeigen"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Eine Änderungssatz-ID eingeben"
-
-#~ msgid "Current value ''{0}'' for user ID isn''t valid"
-#~ msgstr "Der Wert ''{0}'' für die Benutzerkennung ist ungültig"
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Parameter ''{0}'' vom Typ Knoten erwartet, aber ''{1}'' erhalten"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "Für den Parameter {0} wird ein positiver, ganzzahliger Wert benötigt. "
-#~ "Angegeben wurde aber ''{1}''."
-
-#~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
-#~ msgstr ""
-#~ "Neuen Objekten kann keine Änderungssatznummer > 0 zugewiesen werden. "
-#~ "Änderungssatznummer ist {0}"
-
-#~ msgid ""
-#~ "<html>The selected object isn''t available in the current<br>edit layer "
-#~ "''{0}''.</html>"
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer ''{0}''.</html>"
-#~ msgstr[0] ""
-#~ "<html>Das ausgewählte Objekt ist in der aktuellen Ebene<br />''{0}'' "
-#~ "nicht verfügbar.</html>"
-#~ msgstr[1] ""
-#~ "<html>Keines der ausgewählten Objekte ist in der aktuellen<br />Ebene "
-#~ "''{0}'' verfügbar.</html>"
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr ""
-#~ "Dieser Wert ist keine gültige Nummer für einen Änderungssatz. Bitte geben "
-#~ "Sie eine positive Ganzzahl ein."
-
-#~ msgid ""
-#~ "Can't build changeset query with time based restrictions. Input isn't "
-#~ "valid."
-#~ msgstr ""
-#~ "Kann keine Anfrage nach Änderungssätzen formulieren. Die Eingaben sind "
-#~ "ungültig."
-
-#~ msgid ""
-#~ "Can''t restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Auswahl kann nicht auf geografischen Bereich begrenzt werden. Die "
-#~ "Eingaben sind ungültig."
-
-#~ msgid ""
-#~ "Can't restrict changeset query to the current user because the current "
-#~ "user is anonymous"
-#~ msgstr ""
-#~ "Auswahl kann nicht auf eigene Änderungssätze begrenzt werden, weil keine "
-#~ "Benutzerkennung eingegeben wurde."
-
-#~ msgid "Can''t restrict the changeset query to the user name ''{0}''"
-#~ msgstr ""
-#~ "Auswahl kann nicht auf Änderungssätze des Benutzers ''{0}'' begrenzt "
-#~ "werden"
-
-#~ msgid ""
-#~ "The current value isn't a valid user ID. Please enter an integer value > 0"
-#~ msgstr ""
-#~ "Der Wert ist keine gültige Benutzernummer. Bitte geben Sie eine positive "
-#~ "Ganzzahl ein."
-
-#~ msgid ""
-#~ "<html>The  current value isn't a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr ""
-#~ "<html>Der Wert ist kein gültiger Benutzername.<br />Bitte geben Sie einen "
-#~ "Benutzernamen ein.</html>"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Anwählen, um nur eigene Änderungsgruppen abzufragen.<br>Abwählen, "
-#~ "um alle Änderungsgruppen abzufragen.</html>"
-
-#~ msgid ""
-#~ "Failed to update primitive with id {0} because current edit layer doesn't "
-#~ "include such a primitive"
-#~ msgstr ""
-#~ "Das Objekt Nr. {0} konnte nicht aktualisiert werden, weil die aktuelle "
-#~ "Ebene kein solches Objekt enthält"
-
-#~ msgid ""
-#~ "<html>Warning: depending on the authentication method the proxy server "
-#~ "uses the password may be transferred unencrypted.</html>"
-#~ msgstr ""
-#~ "<html>Warnung: Je nachdem, welche Autorisierungsmethode der Proxy-Server "
-#~ "benutzt, wird das Kennwort möglicherweise unverschlüsselt übertragen.</"
-#~ "html>"
-
-#~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
-#~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">Änderungssatz konfigurieren</a>)"
-
-#~ msgid ""
-#~ "Can''t create a changeset query including both the query parameters "
-#~ "''uid'' and ''display_name''"
-#~ msgstr ""
-#~ "Änderungssatzanfragen, die sowohl die Parameter ''uid'' als auch "
-#~ "''display_name'' enthalten, sind nicht möglich"
-
-#~ msgid "User name: "
-#~ msgstr "Benutzername: "
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Ein OSM Datenprüfer. Er sucht nach Problemen in den Daten und bietet "
-#~ "Fehlerbehebungen für häufige Probleme an. Eine Rechtschreibprüfung für "
-#~ "Schlüsselnamen ist integriert."
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "Merkmalsammlung konnte nicht auf ein Objekt angewendet werden, da sie "
-#~ "Schlüssel mit mehreren Werten enthält."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen."
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} Konflikt wurde <strong>automatisch aufgelöst</strong> indem {0} "
-#~ "Objekt<br>aus dem lokalen Datensatz entfernt wurde,  weil es bereits auf "
-#~ "dem Server gelöscht wurde."
-#~ msgstr[1] ""
-#~ "{0} Konflikte wurden <strong>automatisch aufgelöst</strong> indem {0} "
-#~ "Objekte<br>aus dem lokalen Datensatz entfernt wurden, weil sie bereits "
-#~ "auf dem Server gelöscht wurden."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Parameter \"{0}\" darf nicht NULL sein."
-
-#~ 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] ""
-#~ "Diese Auswahl enthält {0} Weg. Sind Sie sicher, dass er vereinfacht "
-#~ "werden soll?"
-#~ msgstr[1] ""
-#~ "Diese Auswahl enthält {0} Wege. Sind Sie sicher, dass alle vereinfacht "
-#~ "werden sollen?"
-
-#~ msgid "Jump forward"
-#~ msgstr "Springe vor"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Im lokalen Datensatz befinden sich {0} Elemente, welche auf dem "
-#~ "Server möglicherweise gelöscht wurden.<br>Beim späteren Versuch diese "
-#~ "hochzuladen wird der Server sehr wahrscheinlich einen Konflikt melden."
-#~ "<br><br>Auf <strong>{1}</strong> klicken, um den Status der Elemente auf "
-#~ "dem Server zu überprüfen.<br>Auf <strong>{2}</strong> klicken, um das "
-#~ "Problem zu ignorieren.<br></html>"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Bitte einen Filterbegriff eingeben."
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} Relationen referenzieren sich gegenseitig.<br>Bevor die "
-#~ "gegenseitigen Abhängigkeiten nicht gelöscht wurden, kann JOSM diese "
-#~ "Relationen nicht hochladen.</html>"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Sie sind dabei, Knoten außerhalb des heruntergeladenen Bereichs zu "
-#~ "löschen.<br>Das kann zu Problemen führen, wenn andere Objekte (die Sie "
-#~ "nicht sehen) diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Achtung: Fehler beim Setzen der Voreinstellungen, da das angegebene "
-#~ "Verzeichnis \"{0}\" kein Verzeichnis ist."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Fehler beim Setzen der Voreinstellungen, da das angegebene "
-#~ "Verzeichnis \"{0}\" kein Verzeichnis ist.</html>"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Zeichenstil des inneren Weges ''{0}'' entspricht dem Multipolygon."
-
-#~ msgid "User ID: "
-#~ msgstr "Benutzerkennung: "
-
-#~ msgid ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-#~ msgstr ""
-#~ "Der Server meldet, daß der aktuelle Änderungssatz geschlossen wurde."
-#~ "<br>Wahrscheinlich hat die Größe des Änderungssatzes die max. "
-#~ "Größe<br>von {0} Objekten auf dem Server ''{1}'' überschritten."
-
-#~ msgid ""
-#~ "<html>Can''t upload {0} objects in one request because the<br>max. "
-#~ "changeset size {1} on server ''{2}'' is exceeded.</html>"
-#~ msgstr ""
-#~ "<html>{0} Objekte können nicht in einer Anfrage hochladen, da die<br>max. "
-#~ "Änderungssatz-Größe {1} auf dem Server ''{2}'' überschritten wird.</html>"
-
-#~ msgid ""
-#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
-#~ "to map editing.<br>"
-#~ msgstr ""
-#~ "''<strong>{0}</strong>'' klicken, um weitere Änderungssätze hochzuladen."
-#~ "<br>''<strong>{1}</strong>'' klicken, um zum Hochladen-Dialog "
-#~ "zurückzukehren.<br>''<strong>{2}</strong>'' klicken, um das Hochladen "
-#~ "abzubrechen und die Bearbeitung fortzusetzen.<br>"
-
-#~ msgid ""
-#~ "<html><p>Alternatively if that doesn't work you can manually fill in the "
-#~ "information<br>below at this URL:</p></html>"
-#~ msgstr ""
-#~ "<html><p>Sollte obiger Link nicht funktionieren, können Sie alternativ "
-#~ "die<br>Informationen manuell unter folgender URL eintragen:</p></html>"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Warnung: Eigenschaft \"{0}\" nicht gefunden."
-
-#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Für den Parameter \"{0}\" wird eine positive ganze Zahl erwartet. "
-#~ "Erhalten: {1}."
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "Hinweis: JOSM benötigt für einige Aufgaben sehr viel Speicher. Bei Bedarf "
-#~ "kann mit\n"
-#~ "      folgender Java-Option der nutzbare Speicher für das Programm erhöht "
-#~ "werden."
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Unerwarteter Spaltenindex ({0})."
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Es gibt {0} zusätzliche Objekte, die in Beziehung zu {1} "
-#~ "stehen<br>und die auf dem Server gelöscht sind.<br><br>Sollen diese "
-#~ "Knotenpunkte auch wiederhergestellt werden?</html>"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "sichtbar (auf Server)"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ja, entfernen"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Parameter \"{0}\" darf nicht leer sein."
-
-#~ msgid ""
-#~ "Warning: the JVM is not configured to lookup proxies from the system "
-#~ "settings. The property ''java.net.useSystemProxies'' was missing at "
-#~ "startup time. Won't use a proxy."
-#~ msgstr ""
-#~ "Warnung: Die JVM wurde nicht konfiguriert, um die Proxy-Einstellungen des "
-#~ "Systems zu übernehmen. Die Eigenschaft \"java.net.useSystemProxies\" "
-#~ "fehlte beim Starten. Es wird kein Proxy verwendet."
-
-#~ msgid ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Sie haben das Vereinen der Unterschiede in diesem Konflikt nicht "
-#~ "beendet.<br>Konfliktlösungen werden nicht aktiviert, solange nicht alle "
-#~ "Unterschiede gelöst sind.<br>Wählen Sie <strong>'{0}'</strong>, um "
-#~ "trotzdem zu schließen. <strong>Bereits<br>gelöste Unterschiede werden "
-#~ "nicht angewandt.</strong><br>Wählen Sie <strong>{1}</strong>, um zur "
-#~ "Konfliktlösung zurückzukehren.</html>"
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>Sie haben keine Benutzerkennung eingestellt, daher kann JOSM "
-#~ "Ihre<br>Änderungssätze nicht vom Server laden. Geben Sie Ihren<br>OSM-"
-#~ "Benutzernamen in den Einstellungen an.</html>"
-
-#~ msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-#~ msgstr "<html>Konnte die Dateien nicht lesen.<br>Fehler:<br>{0}</html>"
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
-#~ msgstr "<html><b>{0}</b> von <b>{1}</b> Bildern an GPS-Spur angepaßt."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Datei \"{0}\" konnte nicht gelesen werden.<br>Fehler lautet:<br>{1}"
-#~ "</html>"
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-#~ msgstr ""
-#~ "<html><b>{0}</b> von <b>{1}</b> Bildern an GPS-Spur angepaßt.</html>"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Dieser Test prüft, dass keine Wege mit den gleichen Merkmalen auf den "
-#~ "selben Koordinaten liegen."
-
-#~ msgid ""
-#~ "<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
-#~ "validate again.</html>"
-#~ msgstr ""
-#~ "<html>''{0}'' ist keine gültige OSM-API-URL.<br>Bitte überprüfen Sie die "
-#~ "Schreibweise und führen Sie eine erneute Prüfung durch.</html>"
-
-#~ msgid "The password can't be empty. Please enter your OSM password"
-#~ msgstr ""
-#~ "Das Passwort darf nicht leer sein. Bitte geben Sie Ihr OSM-Passwort ein"
-
-#~ msgid "OAuth authorisation failed"
-#~ msgstr "OAuth-Autorisierung fehlgeschlagen"
-
-#~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-#~ msgstr ""
-#~ "Warnung: Informationen zum aktuellen JOSM-Nutzer konnten nicht abgerufen "
-#~ "werden. Ausnahmefehler: {0}"
-
-#~ msgid "Authorise now"
-#~ msgstr "Jetzt autorisieren"
-
-#~ msgid "The user name can't be empty. Please enter your OSM user name"
-#~ msgstr ""
-#~ "Der Benutzername darf nicht leer sein. Bitte geben Sie Ihren OSM-"
-#~ "Benutzernamen ein."
-
-#~ msgid "Close the dialog and cancel authorisation"
-#~ msgstr "Dialog schließen und Autorisierung abbrechen"
-
-#~ msgid "Please select an authorisation procedure: "
-#~ msgstr "Bitte wählen Sie eine Autorisierungsmethode: "
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "In der aktuellen Ebene auf die Objekte dieses Änderungssatzes zoomen"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "In der aktuellen Ebene auf die zugehörigen Objekte zoomen"
-
-#~ msgid "Authorise JOSM to access the OSM API"
-#~ msgstr "JOSM-Zugriff auf OSM-API autorisieren"
-
-#~ msgid "Run the automatic authorisation steps again"
-#~ msgstr "Die automatischen Autorisierungsschritte erneut starten"
-
-#~ msgid "Authorise URL:"
-#~ msgstr "Autorisierungs-URL:"
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Nicht-Weg im Multipolygon."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Innenweg im Multipolygon ist außen."
-
-#~ msgid ""
-#~ "<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html"
-#~ msgstr ""
-#~ "<html>OAuth-Zugangsmarke erfolgreich von OSM-Website erhalten. Klicken "
-#~ "Sie auf <strong>{0}</strong>, um die Marke zu akzeptieren. JOSM wird sie "
-#~ "in folgenden Anfragen für den Zugriff auf die OSM-API verwenden.</html>"
-
-#~ msgid ""
-#~ "Alternatively, if that doesn't work you can manually fill in the "
-#~ "informationbelow at this URL:"
-#~ msgstr ""
-#~ "Alternativ, wenn dies nicht funktioniert, können Sie die untenstehenden "
-#~ "Informationen in dieser URL eintragen:"
-
-#~ msgid ""
-#~ "There the error information provided below should already befilled in for "
-#~ "you. Please include information on how to reproducethe error and try to "
-#~ "supply as much detail as possible."
-#~ msgstr ""
-#~ "Dort sollte auch die untenstehende Fehlerinformation bereits für Sie "
-#~ "vorausgefüllt sein. Bitte fügen Sie soviel Informationen und Details wie "
-#~ "möglich dazu, um den Fehler reproduzieren zu können."
-
-#~ msgid ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-#~ msgstr ""
-#~ "Sie sollten auch Ihre Plugins upgedated haben. Wenn beides nicht hilft, "
-#~ "melden Sie einen Bug in unserem bugtracker über diesen Link:"
-
-#~ msgid ""
-#~ "You have encountered an error in JOSM. Before you file a bug reportmake "
-#~ "sure you have updated to the latest version of JOSM here:"
-#~ msgstr ""
-#~ "Sie sind auf ein Problem im JOSM gestoßen. Bevor Sie einen Bug melden, "
-#~ "stellen Sie sicher, die neueste Version von hier heruntergelden zu haben:"
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Erwarteter Wert des Typs long > 0 für den Parameter \"{0}\", bekam {1}"
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr "Erwartete unique id >0 für Primitive id, bekam {0}"
-
-#~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
-#~ "and internal id {2}"
-#~ msgstr ""
-#~ "Warnung: ignoriere changeset id {0} für neues Object mit externer id {1} "
-#~ "und interner id {2}"
-
-#~ msgid ""
-#~ "Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
-#~ "capabilities. Got ''{2}"
-#~ msgstr ""
-#~ "Warnung: ungültiger Wert des Attributs \"{0}'' von Element ''{1}'' der "
-#~ "Servermöglichkeiten.  ''{2}\""
-
-#~ msgid "The current value isn't a valid URL"
-#~ msgstr "Der aktuelle Wert ist keine gültige URL."
-
-#~ msgid "Failed to authorise OAuth request  ''{0}''"
-#~ msgstr "OAuth-Autorisierungsanfrage ''{0}'' fehlgeschlagen."
-
-#~ msgid "Click to redirect you to the authorisation form on the JOSM web site"
-#~ msgstr ""
-#~ "Klicken, um zum Autorisierungsformular auf der JOSM-Webseite zu gelangen"
-
-#~ msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-#~ msgstr ""
-#~ "OSM-Webseite lieferte keinen Sitzungs-Cookie als Antwort auf ''{0}'',"
-
-#~ msgid "Close the prefereces dialog and discard preference updates"
-#~ msgstr "Einstellungsdialog schließen und Änderungen verwerfen."
-
-#~ msgid "Click to step through the OAuth authorisation process"
-#~ msgstr "Den OAuth-Autorisierungsprozess starten"
-
-#~ msgid ""
-#~ "<html>The OSM API server at ''{0}'' didn''t return a valid response."
-#~ "<br>It is likely that ''{0}'' isn''t an OSM API server.<br>Please check "
-#~ "the spelling of ''{0}'' and validate again.</html>"
-#~ msgstr ""
-#~ "<html>Vom OSM-API-Server ''{0}'' kam keine gülige Antwort."
-#~ "<br>Wahrscheinlich ist ''{0}'' kein OSM-API-Server.<br>Bitte die "
-#~ "Schreibweise von ''{0}'' kontrollieren und erneut .</html>"
-
-#~ msgid ""
-#~ "<html>Could not retrieve the list of your open changesets because<br>JOSM "
-#~ "doesn't know your identity.<br>You've either chosen to work anonymously "
-#~ "or you are not entitled<br>to know the identity of the user on whose "
-#~ "behalf you are working.</html>"
-#~ msgstr ""
-#~ "<html>Kann die Liste der offenen Änderungssätze nicht abrufen,<br>weil "
-#~ "JOSM Ihre Identität nicht kennt.<br>Entweder arbeiten Sie anonym, oder "
-#~ "sie haben kein Recht<br>die Identität des Benutzers zu kennen, in dessen "
-#~ "Name Sie arbeiten.</html>"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Bitte geben Sie einen Kommentar für den Änderungssatz ein (mind. 3 "
-#~ "Zeichen)."
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Die kopierten Daten enthalten unvollständige Objekte. Möchten Sie "
-#~ "fortfahren und die kopierten Daten ohne die unvollständigen Objekte "
-#~ "einfügen?"
-
-#~ msgid ""
-#~ "Can't merge because either of the participating primitives is new and the "
-#~ "other is not"
-#~ msgstr ""
-#~ "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind"
-
-#~ msgid ""
-#~ "Parameters --download, --downloadgps and --selection are processed in "
-#~ "this order."
-#~ msgstr ""
-#~ "Die Parameter --download, --downloadgps und --selection werden in dieser "
-#~ "Reihenfolge verarbeitet."
-
-#~ msgid "loading plugin ''{0}''"
-#~ msgstr "Plugin {0} laden"
-
-#~ msgid ""
-#~ "A required plugin for plugin {0} was not found. The required plugin is:"
-#~ msgid_plural ""
-#~ "{1} required plugins for plugin {0} were not found. The required plugins "
-#~ "are:"
-#~ msgstr[0] "Das Plugin {0} benötigt zusätzlich das folgende Plugin:"
-#~ msgstr[1] "Das Plugin {0} benötigt zusätzlich die folgenden Plugins:"
-
-#~ msgid ""
-#~ "Please open the Preference Dialog after JOSM has started and try to "
-#~ "update them manually."
-#~ msgstr ""
-#~ "Bitte öffen Sie den Einstellungsdialog, wenn JOSM gestartet ist, und "
-#~ "führen Sie die Aktualisierung manuell durch."
-
-#~ msgid "Removing umaintained plugins..."
-#~ msgstr "Nicht mehr gewartete Plugins entfernen..."
-
-#~ msgid ""
-#~ "<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-#~ "username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Die Anmeldung beim OSM-Server ''{0}'' ist fehlgeschlagen. Geben Sie "
-#~ "bitte einen gültigen Benutzernamen und das richtige Kennwort ein.</html>"
-
-#~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-#~ msgstr ""
-#~ "Hinzufügen eines OAuth-Authentifizierungskopfes fehlgeschlagen. Aktuell "
-#~ "ist keine OAuth-Zugriffskennung konfiguriert."
-
-#~ msgid ""
-#~ "<html><body>Please enter an OAuth Access Token which is authorised to "
-#~ "access the OSM server ''{0}''.</body></html>"
-#~ msgstr ""
-#~ "<html><body>Bitte eine OAuth-Zugriffskennung für den Zugriff auf den OSM-"
-#~ "Server ''{0}'' eingeben.</body></html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed because JOSM wasn't able to build<br>a valid login "
-#~ "URL from the OAuth Authorise Endpoint URL ''{0}''.<br><br>Please check "
-#~ "your advanced setting and try again.</html>"
-#~ msgstr ""
-#~ "<html>Der automatische Erwerb einer OAuth-Zugriffskennung vom OSM-Server "
-#~ "ist fehlgeschlagen, da mit der OAuth-Autorisierungs-URL ''{0}''<br>keine "
-#~ "gültige Anmelde-URL erzeugt werden konnte.<br><br>Bitte prüfen Sie die "
-#~ "erweiterten Einstellungen und versuchen Sie es erneut.</html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed.<br><br>Please try again or choose another kind of "
-#~ "authorisation process,<br>i.e. semi-automatic or manual authorisation.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Der automatische Erwerb einer OAuth-Zugriffskennung vom OSM-Server "
-#~ "ist fehlgeschlagen.<br><br>Bitte versuchen Sie es erneut oder nutzen Sie "
-#~ "einen andere Autorisierungsmethode,<br>z.B. die halbautomatische oder "
-#~ "manuelle Autorisierung.</html>"
-
-#~ msgid "Authorising request token ''{0}''..."
-#~ msgstr "Autorisiere Anfragekennung ''{0}''..."
-
-#~ msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
-#~ msgstr ""
-#~ "<html>Schritt 2/3: OAuth-Zugriffskennung autorisieren und abrufen</html>"
-
-#~ msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
-#~ msgstr ""
-#~ "Abfrage der Benutzerdetails mit der Zugriffskennung mit dem Schlüssel "
-#~ "''{0}'' nicht erlaubt."
-
-#~ msgid ""
-#~ "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM "
-#~ "server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' "
-#~ "with id ''{3}''.</html>"
-#~ msgstr ""
-#~ "<html>Zugriffskennung \"{0}\" erfolgreich für den Zugang zum OSM-Server "
-#~ "\"{1}\" eingesetzt.<br>Sie greifen als Benutzer \"{2}\" mit der ID \","
-#~ "{3}\" auf den OSM-Server zu.</html>"
-
-#~ msgid ""
-#~ "<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
-#~ "launching an authorisation page in an external browser. Please login with "
-#~ "your OSM username and password and follow the instructions to authorise "
-#~ "the Request Token. Then switch back to this dialog and click on <strong>"
-#~ "{0}</strong><br><br>If launching the external browser fails you can copy "
-#~ "the following authorise URL and paste it into the address field of your "
-#~ "browser."
-#~ msgstr ""
-#~ "<html><body>JOSM hat erfolgreich eine Anfragekennung bezogen. JOSM "
-#~ "startet nun einen externen Browser mit einer Autorisierungs-Seite. Melden "
-#~ "Sie sich bitte dort mit ihrer OSM-Benutzerkennung und Ihrem Kennwort an "
-#~ "und folgen Sie den Anweisungen, um die Anfragekennung zu autorisieren. "
-#~ "Dann kehren Sie zu diesem Dialog zurück und klicken Sie auf <strong>{0}</"
-#~ "strong><br><br>Wenn sich der Browser nicht automatisch öffnet, rufen Sie "
-#~ "von Hand den folgende URL im Browser auf:"
-
-#~ msgid ""
-#~ "<html><body>JOSM has successfully retrieved an Access Token. You can now "
-#~ "accept this token. JOSM will used it the future for authentication and "
-#~ "authorisation at the OSM server.<br><br>The access token is: "
-#~ msgstr ""
-#~ "<html><body>JOSM hat eine erfolgreich eine Zugriffskennung bezogen. Sie "
-#~ "können diese Kennung nun akzeptieren. JOSM wird sie in Zukunft zur "
-#~ "Autorisierung beim OSM-Server verwenden.<br><br>Die Zugriffskennung ist: "
-
-#~ msgid ""
-#~ "You don't have an Access Token yet to access the OSM server using OAuth. "
-#~ "Please authorise first."
-#~ msgstr ""
-#~ "Es gibt noch keine Zugriffskennung für den Zugriff mittels OAuth auf den "
-#~ "OSM-Server. Bitte erst autorisieren."
-
-#~ msgid ""
-#~ "<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
-#~ "test to retrieve the user details for this token failed, though."
-#~ "<br>Depending on what rights are granted to this token you may "
-#~ "nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-#~ "other protected resources.</html>"
-#~ msgstr ""
-#~ "<html>Die Zugriffskennung \"{1}\" ist dem OSM-Server \"{0}\" bekannt."
-#~ "<br>Der Test, die Benutzerdetails für diese Kennung abzurufen, schlug "
-#~ "jedoch fehl.<br>Abhängig davon, welche Rechte dieser Kennung gewährt "
-#~ "werden, können Sie sie dennoch benutzen, um Daten hochzuladen, GPS-Spuren "
-#~ "hochzuladen, und/oder auf andere geschützte Ressourcen zuzugreifen."
-
-#~ msgid ""
-#~ "<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
-#~ "''{0}''.<br>The server rejected the Access Token as unauthorised. You "
-#~ "will not<br>be able to access any protected resource on this server using "
-#~ "this token.</html>"
-#~ msgstr ""
-#~ "<html>Zugriff auf dem OSM-Server \"{0}\"<br>mit der Zugriffskennung "
-#~ "\"{0}\" fehlgeschlagen.<br>Der Server hat die Kennung als unberechtigt "
-#~ "zurückgewiesen. Diese Kennung kann nicht zum Zugriff auf geschützte "
-#~ "Ressourcen auf diesem Server verwendet werden.</html>"
-
-#~ msgid ""
-#~ "<html>The test failed because the server responded with an internal error."
-#~ "<br>JOSM couldn''t decide whether the token is valid. Please try again "
-#~ "later.</html>"
-#~ msgstr ""
-#~ "<html>Der Test schlug fehl, weil der Server mit einem internen Fehler "
-#~ "antwortete.<br>JOSM kann nicht entscheiden, ob diese Kennung gültig ist. "
-#~ "Bitte später erneut versuchen.</html>"
-
-#~ msgid ""
-#~ "Click to step through the OAuth authorisation process and generate a new "
-#~ "Access Token"
-#~ msgstr ""
-#~ "Den OAuth-Autorisierungsprozess starten und eine neue Zugriffskennung "
-#~ "erzeugen"
-
-#~ msgid ""
-#~ "<html>Run a fully automatic procedure to get an access token from the OSM "
-#~ "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-#~ "fully<br>automatically authorises the user and retrieves an Access Token."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Automatisch eine Zugriffskennung von der OSM-Webseite beziehen."
-#~ "<br>JOSM greift im Namen des Benutzers auf die OSM-Webseite zu,"
-#~ "<br>autorisiert den Benutzer und bezieht automatisch eine Zugriffskennung."
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>OAuth-Zugriffskennung erfolgreich von der OSM-Webseite abgerufen. "
-#~ "Um die Kennung zu akzeptieren, auf <strong>{0}</strong> klicken. Sie wird "
-#~ "für nachfolgende Anfragen an die OSM API verwendet .</html>"
-
-#~ msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
-#~ msgstr "Autorisiere OAuth-Anfragekennung ''{0}'' bei der OSM-Webseite ..."
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "Alle Elemente auswählen, die in der aktuellen Auswahl vorkommen"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Alle ausgewählten Objekte im momentanen Datensatz vor dem ersten "
-#~ "ausgewählten Element hinzufügen"
-
-#~ msgid ""
-#~ "<html>You updated your JOSM software.<br>To prevent problems the plugins "
-#~ "should be updated as well.<br><br>Update plugins now?</html>"
-#~ msgstr ""
-#~ "<html>Sie habe eine neue JOSM-Version installiert.<br>Um Probleme mit den "
-#~ "Plugins zu vermeiden, sollten auch diese aktualisiert werden."
-#~ "<br><br>Sollen die Plugins jetzt aktualisiert werden?</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Alle Elemente auswählen, die in den {0} Elementen der aktuellen Auswahl "
-#~ "vorkommen"
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Warnung: die Änderungsdatei '/REVISION' fehlt."
-
-#~ msgid ""
-#~ "Can't restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Kann die Änderungssatzanfrage nicht auf bestimmten Bereich begrenzen. Die "
-#~ "Eingabe ist ungültig."
-
-#~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t "
-#~ "a valid URL. Skipping download."
-#~ msgstr ""
-#~ "Warnung: Kann Plugin ''{0}'' nicht herunterladen. Der Link ''{1}'' ist "
-#~ "eine ungültige URL. Überspringe Download."
-
-#~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link isn''t known. "
-#~ "Skipping download."
-#~ msgstr ""
-#~ "Warnung: Kann Plugin ''{0}'' nicht herunterladen. Der Download-Link ist "
-#~ "unbekannt. Überspringe Download."
-
-#~ msgid "The plugin file ''{0}'' doesn't include a Manifest."
-#~ msgstr "Die Plugin-Datei ''{0}'' enthält kein Manifest."
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Warnung: verarbeiten des Mappaint-Zeichenstils von ''{0}'' "
-#~ "fehlgeschlagen. Ausnahme war: {1}"
-
-#~ msgid ""
-#~ "Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Warnung: laden des Mappaint-Zeichenstils von ''{0}'' fehlgeschlagen. "
-#~ "Ausnahme war: {1}"
-
-#~ msgid ""
-#~ "Illegal document structure. Found node, way, or relation outside of "
-#~ "'create', 'modify', or 'delete'."
-#~ msgstr ""
-#~ "Ungültige Dokumentstruktur. Fand Knoten, Weg, oder Relation außerhalb "
-#~ "von  'Anlegen', 'Ändern', oder 'Löschen'."
-
-#~ msgid ""
-#~ "Can't create a changeset query including both the query parameters 'uid' "
-#~ "and 'display_name'"
-#~ msgstr ""
-#~ "Kann keine Änderungssatzanfrage erstellen, die gleichzeitig die "
-#~ "Anfrageparameter 'uid' und 'display_name' enthält."
-
-#~ msgid ""
-#~ "<html>Failed to retrieve information about the current userfrom the OSM "
-#~ "server ''{0}''.<br>This is probably not a problem caused by the tested "
-#~ "Access Token, but<br>rather a problem with the server configuration. "
-#~ "Carefully check the server<br>URL and your Internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Abrufen von Informationen über den aktuellen Benutzer vom OSM-"
-#~ "Server ''{0}'' fehlgeschlagen.<br>Das ist vermutlich kein Problem der "
-#~ "getesteten Zugriffsmarke, sondern<br>eher ein Problem der "
-#~ "Serverkonfiguration. Bitte sorgfältig Server-URL<br>und "
-#~ "Internetverbindung überprüfen.</html>"
-
-#~ msgid ""
-#~ "Warning: JOSM is configured to use proxies from the system setting, but "
-#~ "the JVM is not configured to retrieve them. Resetting preferences to 'No "
-#~ "proxy'"
-#~ msgstr ""
-#~ "Achtung: JOSM ist konfiguriert, die Proxy Einstellungen von den "
-#~ "Systemeinstellungen zu beziehen, jedoch ist die JVM nicht konfiguriert, "
-#~ "diese zu lesen. Einstellungen auf 'Ohne Proxy' zurückgesetzt."
-
-#~ msgid ""
-#~ "Warning: the JVM is not configured to lookup proxies from the system "
-#~ "settings. The property 'java.net.useSystemProxies' was missing at startup "
-#~ "time. Won't use a proxy."
-#~ msgstr ""
-#~ "Achtung: Die JVM ist nicht konfiguriert, die Proxy Einstellungen von den "
-#~ "Systemeinstellungen zu lesen. Das Objekt 'java.net.useSystemProxies' war "
-#~ "zum Startzeitpunkt nicht verfügbar. Es wird kein Proxy verwendet."
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr ""
-#~ "\"{0}\" ist nicht geschlossen und kann deshalb nicht vereinigt werden."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Bitte mindestens zwei Knoten zum Vereinigen wählen."
-
-#~ msgid ""
-#~ "When one or more ways are selected, the shape is adjusted such, that all "
-#~ "angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-#~ "Then, the direction is fixed by these two reference nodes.(Afterwards, "
-#~ "you can undo the movement for certain nodes:<br>Select them and press the "
-#~ "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
-#~ msgstr ""
-#~ "Wenn ein oder mehrere Wege ausgewählt sind, wird deren Form so angepasst, "
-#~ "dass alle Winkel 90 oder 180 Grad betragen. <h3>Sie können der Auswahl "
-#~ "zwei Knoten hinzufügen. Dann wird die Ausrichtung durch die beiden "
-#~ "Referenzknoten vorgegeben. (Hinterher können Sie die Verschiebung "
-#~ "einzelner Knoten rückgängig machen:<br>Wählen Sie diese aus und drücken "
-#~ "Sie die Tastenkombination für Rechtwinklig anordnen / Rückgängig machen. "
-#~ "Die Voreinstellung dafür ist Umschalt-Q.)"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Ebene ''{0}'' enthält bereits einen Konflikt für Objekt<br>''{1}''."
-#~ "<br>Dieser Konflikt kann nicht hinzugefügt werden.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "WARNUNG: Ebene ''{0}'' existiert nicht mehr. Der Konflikt für das Objekt "
-#~ "''{1}'' kann nicht entfernt werden."
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "{0} Objekt wiederherstellen"
-#~ msgstr[1] "{0} Objekte wiederherstellen"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Zielobjekt mit der ID {0} und Version {1} ist sichtbar obwohl das "
-#~ "Quellobjekt mit der niedrigeren Version {2} nicht sichtbar ist. Diese "
-#~ "Inkonsistenz konnte nicht gelöst werden. Zielobjekt beibehalten. "
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "K"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Knoten."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Der \"from\"-Weg beginnt oder endet nicht am \"via\"-Weg."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Der \"to\"-Weg beginnt oder endet nicht am \"via\"-Weg."
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "<html>Es gibt {0} zusätzlichen Knoten vom Weg {1},<br>der auf dem Server "
-#~ "gelöscht ist.<br><br>Soll dieser Knoten auch wiederhergestellt werden?</"
-#~ "html>"
-#~ msgstr[1] ""
-#~ "<html>Es gibt {0} zusätzliche Knoten vom Weg {1},<br>die auf dem Server "
-#~ "gelöscht sind.<br><br>Sollen diese Knoten auch wiederhergestellt werden?</"
-#~ "html>"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Es gibt {0} zusätzliches Objekt, das von Relation {1} referenziert "
-#~ "wird<br>und das auf dem Server gelöscht ist.<br><br>Soll dieses Objekt "
-#~ "auch wiederhergestellt werden?"
-#~ msgstr[1] ""
-#~ "Es gibt {0} zusätzliche Objekte, die von Relation {1} referenziert "
-#~ "werden<br>und die auf dem Server gelöscht sind.<br><br>Sollen diese "
-#~ "Objekte auch wiederhergestellt werden?"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Die Kind-Relation<br>{0}<br> ist auf dem Server gelöscht. Sie kann "
-#~ "nicht geladen werden.</html>"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Eine leere Rolle wird {0} Objekt zugewiesen."
-#~ msgstr[1] "Eine leere Rolle wird {0} Objekten zugewiesen."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Dies ist equivalent zum Löschen der Rollen für diese Objekte."
-
-#~ msgid "GPS point"
-#~ msgstr "GPS-Punkt"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Warnung: Mappaint-Stile von ''{0}'' konnten nicht eingelesen werden. "
-#~ "Fehlermeldung war: {1}"
-
-#~ msgid ""
-#~ "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>OAuth-Zugriffskennung erfolgreich von der OSM-Webseite abgerufen. "
-#~ "Um die Kennung zu akzeptieren, auf <strong>{0}</strong> klicken. Sie wird "
-#~ "für nachfolgende Anfragen an die OSM API verwendet .</html>"
-
-#~ msgid ""
-#~ "<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 do not 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, ''.''/Period 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>"
-#~ msgstr ""
-#~ "<p>Sie werden feststellen, dass die Tastenauswahl auf der nächsten Seite "
-#~ "alle Java bekannten Tastaturen enthält und nicht nur die Tasten Ihrer "
-#~ "Tastatur. Bitte verwenden Sie nur Tasten, die auf Ihrer Tastatur "
-#~ "verfügbar sind. Falls Ihre Tastatur keine ''Copy''-Taste hat (PC-"
-#~ "Tastaturen haben diese nicht, aber Sun-Tastaturen), verwenden Sie sie "
-#~ "nicht. Außerdem gibt es ''Tasten'', welche auf der Tastatur Abkürzungen "
-#~ "entsprechen (z.B. '':''/Doppelpunkt). Bitte verwenden Sie diese nicht, "
-#~ "sondern die Basistaste (''.''/Punkt auf der deutschen Tastatur, ...). "
-#~ "Falls Sie dies nicht tun, kann es Konflikte geben, da JOSM nicht erkennt, "
-#~ "dass Strg+Umschalt+. und Strg+: das gleiche ist...</p>"
-
-#~ msgid "Do not check and ask again at startup (remembers choice)"
-#~ msgstr "Nicht wieder prüfen und beim Start anzeigen (speichert Auswahl)"
-
-#~ msgid ""
-#~ "Alternatively, if that does not work you can manually fill in the "
-#~ "informationbelow at this URL:"
-#~ msgstr ""
-#~ "Alternativ, wenn dies nicht funktioniert, können Sie die untenstehenden "
-#~ "Informationen in dieser URL eintragen:"
-
-#~ msgid ""
-#~ "Primitive {0} cannot be added to the relation because it was deleted."
-#~ msgstr ""
-#~ "Objekt {0} kann nicht zur Relation hinzugefügt werden, weil es gelöscht "
-#~ "wurde"
-
-#~ msgid "Node {0} cannot be added to the way because it was deleted"
-#~ msgstr ""
-#~ "Knoten {0} kann nicht zum Weg hinzugefügt werden, weil er gelöscht wurde"
-
-#~ msgid "Indipend."
-#~ msgstr "Freie Tankstelle"
-
-#~ msgid "Authenticationi failed"
-#~ msgstr "Authentifizierung fehlgeschlagen"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Klicken, um den aktuellen Bereich zu laden"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Hilfe-Seite für ein Hilfe-Thema fehlt</"
-#~ "p><p class=\"warning-body\">Für das Hilfe-Thema <strong>{0}</strong> ist "
-#~ "noch keine Hilfe-Seite verfügbar. Sie fehlt sowohl in Ihrer lokalen "
-#~ "Sprache ({1}) als auch in Englisch.<br><br>Bitte helfen Sie, das JOSM-"
-#~ "Hilfe-System zu verbessern und tragen Sie die fehlenden Informationen "
-#~ "nach.  Sie können sowohl die <a href=\"{2}\">Hilfe-Seite in ihrer lokalen "
-#~ "Sprache ({1})</a>, als auch die <a href=\"{3}\">Hilfe-Seite in Englisch</"
-#~ "a> editieren.</p></html>"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Defekte Objektvorlage ''{0}-{1}'' - Die Anzahl der Werte in "
-#~ "''display_values'' muss mit der Anzahl in ''values'' identisch sein."
-
-#~ msgid "Error: "
-#~ msgstr "Fehler: "
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr "<html>Kann Verzeichnis nicht öffnen.<br>Bitte Datei wählen!</html>"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr "Alle Knoten im Winkel von 90 oder 270 Grad anordnen"
-
-#~ msgid ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-#~ msgstr ""
-#~ "Warnung: Die Installation des bereits heruntergeladenen Plugins \"{0}\" "
-#~ "ist fehlgeschlagen. Installation wird übersprungen. JOSM wird die alte "
-#~ "Plugin-Version laden."
-
-#~ msgid "Dsdfasdfsdfotos"
-#~ msgstr "DsdfasdfsdFotos"
-
-#~ msgid "Josminator - Just do it!"
-#~ msgstr "Josminator - einfach machen!"
-
-#~ msgid "Exec"
-#~ msgstr "Ausführen"
-
-#~ msgid "Execute Script"
-#~ msgstr "Skript ausführen"
-
-#~ msgid "Do some stuff"
-#~ msgstr "Mach ein paar Sachen"
-
-#~ msgid "nice Plugin"
-#~ msgstr "nettes Plugin"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Einen geschlossenen Weg mit mindestens vier Knoten auswählen."
-
-#~ msgid "Download Object"
-#~ msgstr "Objekt herunterladen"
-
-#~ msgid "Download Object..."
-#~ msgstr "Objekt herunterladen..."
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automatisch erste WMS-Ebene auswählen, falls mehrere Ebenen vorhanden "
-#~ "sind."
-
-#~ msgid ""
-#~ "Following primitives could not be added because they are deleted: {0}"
-#~ msgstr ""
-#~ "Die folgenden Objekte konnten nicht hinzugefügt werden, weil sie gelöscht "
-#~ "wurden: {0}"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Achtung: Die Adresse \"{0}\" des WMS-Dienstes enthält kein ''&'' oder "
-#~ "''?''."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Zeigt ein OpenLayers-Hintergrundbild"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Erlaubt anderen Programmen, Kommandos an JOSM zu senden."
-
-#~ msgid "Native Password Manager Plugin: "
-#~ msgstr "Passwortverwaltungsplugin "
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Erstellt ein Multipolygon mit einem Mausklick - wesentlich einfacher, als "
-#~ "mit dem Standard-Relationen-Editor."
-
-#~ msgid ""
-#~ "Cannot open {0} file with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgstr[0] ""
-#~ "{0} Datei konnte nicht mit Datei Importer \"{1}\" geöffnet werden. "
-#~ "Überspringe die folgende Datei:"
-#~ msgstr[1] ""
-#~ "{0} Dateien konnten nicht mit Datei Importer \"{1}\" geöffnet werden. "
-#~ "Überspringe die folgenden Dateien:"
-
-#~ msgid ""
-#~ "Cannot open {0} file because no suitable file importer is available. "
-#~ "Skipping the following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files because no suitable file importer is available. "
-#~ "Skipping the following files:"
-#~ msgstr[0] ""
-#~ "{0} Datei konnte nicht geöffnet werden, da kein passender Datei-Importer "
-#~ "verfügbar ist. Überspringe die folgende Datei:"
-#~ msgstr[1] ""
-#~ "{0} Dateien konnten nicht geöffnet werden, da kein passender Datei-"
-#~ "Importer verfügbar ist. Überspringe die folgenden Dateien:"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Zusammenführen von gelöschten Objekten ist fehlgeschlagen"
-
-#~ msgid "<number>"
-#~ msgstr "<Zahl>"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Die folgenden Objekte konnten nicht ins Zielobjekt kopiert werden,"
-#~ "<br>weil sie in der Zielebene bereits gelöscht sind."
-
-#~ msgid "Use all my elements"
-#~ msgstr "Alle meine Elemente verwenden"
-
-#~ msgid "Use all their elements"
-#~ msgstr "Alle Serverelemente verwenden"
-
-#~ msgid "minor_line"
-#~ msgstr "Freileitung (Schwachstrom)"
-
-#~ msgid "range"
-#~ msgstr "Bereich"
-
-#~ msgid "Image zoom interpolation:"
-#~ msgstr "Bildzoomstufeninterpolation:"
-
-#~ msgid "Goods"
-#~ msgstr "Kleinlaster"
-
-#~ msgid "Set width of building"
-#~ msgstr "Breite des Gebäudes festlegen"
-
-#~ msgid "loading plugin ''{0}'' ({1})"
-#~ msgstr "Lade Erweiterung ''{0}'' ({1})"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Auf gegenüberliegendes Ende des Gebäudes zeigen"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Auf Gebäudeecke zeigen, um zu beginnen"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Lädt Kalibrierdaten aus einer Datei"
-
-#~ msgid ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-#~ msgstr ""
-#~ "Durch OAuth können Sie JOSM die Erlaubnis erteilen, in Ihrem Namen "
-#~ "Kartendaten und GPS-Tracks hochzuladen (<a href=\"urn:josm-oauth-info"
-#~ "\">Weitere Informationen...</a>)."
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Bitte geben Sie Ihren OSM-Benutzernamen und Ihr Passwort ein. Das "
-#~ "Passwort wird <strong>nicht</strong> im Klartext gespeichert, sondern "
-#~ "<strong>einmalig</strong> direkt an den OSM-Server übertragen. Bei "
-#~ "nachfolgenden Hochlade-Vorgängen wird Ihr Passwort nicht mehr übertragen."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Achtung:</strong> Das Passwort wird <strong>einmalig</strong> im "
-#~ "Klartext zur OSM-Website übertragen. Verwenden Sie <strong>kein wichtiges "
-#~ "Passwort</strong> , so lange der OSM-Server keinen verschlüsselten "
-#~ "Kommunikationskanal (HTTPS) bereitstellt."
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Plugin {0} konnte nicht geladen werden, da die <br>Hauptklasse "
-#~ "''{1}'' nicht gefunden wurde.<br>Aus den Einstellungen entfernen?"
-
-#~ msgid ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-#~ msgstr ""
-#~ "<html>Herunterladen der Daten fehlgeschlagen. Das Format wird nicht "
-#~ "unterstützt, es ist falsch formetiert oder inkonsistent.<br><br>Details "
-#~ "(auf Englisch): {0}</html>"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Bild nicht korrekt erstellt."
-
-#~ msgid "Grab buildings"
-#~ msgstr "Gebäude aufnehmen"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Gebäude durch Klicken extrahieren (nur Vektorbilder)"
-
-#~ msgid "Edit new turn restriction in layer ''{0}''"
-#~ msgstr "Eine neue Abbiegebeschränkung auf Ebene ''{0}'' bearbeiten"
-
-#~ msgid "Edit turn restriction #{0} in layer ''{1}''"
-#~ msgstr "Abbiegebeschränkung #{0} auf Ebene ''{1}'' bearbeiten"
-
-#~ msgid "Create new turn restriction in layer ''{0}''"
-#~ msgstr "Eine neue Abbiegebeschränkung auf Ebene ''{0}'' anlegen"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Diese Funktion erfordert (mindestens) eine spezielle cadastre\n"
-#~ "Gebäude-Ebene und eine OSM-Datenebene."
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Warnung: das Plugin turnrestrictions ersetzt die Aktion ''{0}'' belegt "
-#~ "durch die Tastenkombination ''{1}'' durch die Aktion ''{2}''"
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "Der <strong>from</strong>-Weg <span class=\"object-name\">{0}</span> und "
-#~ "der <strong>to</strong>-Weg <span class=\"object-name\">{1}</span> "
-#~ "schneiden sich am Knoten <span class=\"object-name\">{2}</span>, aber der "
-#~ "Knoten <span class=\"object-name\">{2}</span> ist nicht als <strong>via</"
-#~ "strong>-Objekt eingetragen.<br>Sie sollten <span class=\"object-name\">{2}"
-#~ "</span> als einziges <strong>via</strong>-Objekt setzen."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Diese Abbiegebeschränkung nutzt den Knoten <span class=\"object-name\">{0}"
-#~ "</span> als Relationselement mit Rolle <tt>{1}</tt>."
-
-#~ msgid "Splits the way"
-#~ msgstr "Trennt den Weg auf"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Nur Gebäude-Ebene holen"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Diese Abbiegebeschränkung verwendet die Relation <span class=\"object-name"
-#~ "\">{0}</span> als Relationselement mit der Rolle <tt>{1}</tt>."
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Einen Weg in der Rolle ''to'' hinzufügen"
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Einen Weg in der Rolle ''from'' hinzufügen"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Diese Abbiegebeschränkung nutzt den Weg <span class=\"object-name\">{0}</"
-#~ "span> sowohl in der Rolle <tt>from</tt> als auch in der Rolle <tt>to</"
-#~ "tt>. In einer Abbiegebeschränkung sollte der Weg mit der Rolle <tt>from</"
-#~ "tt> jedoch unterschiedlich sein vom Weg mit der Rolle <tt>to</tt>."
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Ein Weg mit der Rolle <tt>to</tt> ist in einer Abbiegebeschränkung "
-#~ "erforderlich."
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "Bitte gehen Sie zum Standard-Editor und wählen Sie einen Weg aus."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Ein Weg mit der Rolle <tt>from</tt> ist in einer Abbiegebeschränkung "
-#~ "erforderlich."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Gehe zum Standard-Editor und wähle einen Weg"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Stattdessen wird ein Weg benötigt."
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "Der Weg <span class=\"object-name\">{0}</span> mit Rolle <tt>{1}</tt> "
-#~ "sollte beim Knoten <span class=\"object-name\">{2}</span> aufgeteilt "
-#~ "werden. Er schneidet dort den Weg <span class=\"object-name\">{3}</span>."
-
-#~ msgid "tagged"
-#~ msgstr "markiert"
-
-#~ msgid ""
-#~ "The turnrestrictions plugin allows to create and edit turn restrictions "
-#~ "in the OpenStreetMap database."
-#~ msgstr ""
-#~ "Das Plugin \"turnrestrictions\" erlaubt das Erstellen und Bearbeiten von "
-#~ "Abbiege-Regeln in der OpenStreetMap-Datenbank."
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Filter Verst.:{0} Aus:{0}"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} Konflikt muss noch gelöst werden.<br><br>Bitte öffnen Sie den "
-#~ "Konflikt-Dialog und lösen Sie ihn manuell."
-#~ msgstr[1] ""
-#~ "{0} Konflikte müssen noch gelöst werden.<br><br>Bitte öffnen Sie den "
-#~ "Konflikt-Dialog und lösen Sie sie manuell."
-
-#~ msgid "reverter: {0}"
-#~ msgstr "Umkehrer: {0}"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Um Ihre lokale Version zu behalten, muss JOSM<br>die ID des Objekts "
-#~ "{0} auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine<br>neue "
-#~ "ID zuweisen.<br>Stimmen Sie zu?</html>"
-
-#~ msgid " Video"
-#~ msgstr " Video"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Ungültige ID angegeben - Objekt kann nicht heruntergeladen werden."
-
-#~ msgid "With kiosk"
-#~ msgstr "Mit Kiosk"
-
-#~ msgid "farmland"
-#~ msgstr "Farmland"
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Sie wollen unvollständige Objekte löschen.<br>Das kann zu Problemen "
-#~ "führen, das sie das echte Objekt nicht sehen.<br>Wollen Sie die Objekete "
-#~ "wirklich löschen?"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "Ausrichten würde Knoten außerhalb des aktiven Datenbereiches "
-#~ "verschieben.\n"
-#~ "Die Aktion wurde zurückgesetzt."
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "Verbundene Wegsegemente können nicht ausgerichtet werden.\n"
-#~ "Bitte Wegsegmente wählen, die keine Knoten gemeinsam haben."
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Segmente ausrichten.</b> Drücken von <b><i><span style=\"color:"
-#~ "green\">Shift-A</span></i></b>. Alternativ ist das Kommando im "
-#~ "<b>Werkzeuge</b>menü oder kann in der <b>Werkzeugleiste</b> platziert "
-#~ "werden.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "<html>Unable to parse tagging preset source: {0}. Do you really want to "
-#~ "use it?<br><br><table width=600>Error is: {3}</table></html>"
-#~ msgstr ""
-#~ "<html>Objektvorlagenquelle kann nicht analysiert werden: {0}. Soll sie "
-#~ "trotzdem benutzt werden?<br><br><table width=400>Fehler ist: {3}</table></"
-#~ "html>"
-
-#~ msgid ""
-#~ "This changeset have objects outside the downloaded area.\n"
-#~ "It is needed to download them before reverting. Do you want to continue?"
-#~ msgstr ""
-#~ "Dieser Änderungssatz hat Objekte außerhalb des heruntergeladenen "
-#~ "Bereichs.\n"
-#~ "Vor dem Zurücksetzen müssen diese Heruntergeladen werden. Wollen Sie "
-#~ "fortfahren?"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Ziel vom Typ {0} mit ID {1} hat ungültige Version"
-
-#~ msgid "Missing new dataset object for {0} with id {1}"
-#~ msgstr "Fehlender neuer Datensatz für {0} mit ID {1}"
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "Auf Gebäudeecke zeigen, um zu beginnen"
-
-#~ msgid "{0} covers {1}% of GPS track"
-#~ msgstr "{0} deckt {1}% der GPS-Spur ab"
-
-#~ msgid "Building tag:"
-#~ msgstr "Gebäudemerkmal:"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% der GPS-Spur"
-
-#~ msgid "slower"
-#~ msgstr "langsamer"
-
-#~ msgid "faster"
-#~ msgstr "schneller"
-
-#~ msgid "forward"
-#~ msgstr "vorwärts"
-
-#~ msgid "backward"
-#~ msgstr "rückwärts"
-
-#~ msgid "play/pause"
-#~ msgstr "Abspielen/Pause"
-
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Hausnummern- und Straßennamenrelation erzeugen"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "Skripte haben ungültige Daten zurückgelieferte."
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
-#~ msgstr ""
-#~ "Keine Relationen für Adressen nutzen (sondern \"addr:street\" auf Knoten)."
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "Keine Relation für Adressen nutzen (sondern \"addr:street\" an Elementen)."
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr ""
-#~ "Lesen von automatisch gespeicherten osm-Daten nicht möglich ({0}) - {1}"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Erlaubt das Ändern der Beschriftung der GPS-Wegpunkte."
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Seezeicheneditor"
-
-#~ msgid "read protocol version"
-#~ msgstr "Protokollversion lesen"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Das Objekt ''{0}'' wurde bereinigt"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Konflikt im Sichtbarkeitsattribut für das Objekt des Typs {0} mit der ID "
-#~ "{1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Objekt des Typs {0} mit der ID {1} wurde zum Löschen vorgemerkt, fehlt "
-#~ "aber im Quelldatensatz"
-
-#~ msgid "Edit SeaMap Symbols"
-#~ msgstr "SeaMap-Symbole bearbeiten"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (Spiegelserver)"
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr "Die Fernsteuerung soll eine WMS-Ebene von folgender URL laden:"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM hat {0} ungespeicherte OSM-Datenebenen gefunden. Anscheinend ist "
-#~ "JOSM abgestürzt. Sollen die Daten wiederhergestellt werden?"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "Bitte GPS-Timecode eingeben"
-
-#~ msgid "Edit OpenSeaMap"
-#~ msgstr "OpenSeaMap bearbeiten"
-
-#~ msgid "jump"
-#~ msgstr "Anspringen"
-
-#~ msgid "Internal style"
-#~ msgstr "Interner Stil"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr ""
-#~ "Sie haben {0} Elemente ausgewählt. Aber Sie können nur ein Element ändern!"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Es sieht so aus als ob JOSM abgestürzt war. Wollen Sie die Daten "
-#~ "wiederherstellen?"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Eigenschaften eines Objektes ändern"
-
-#~ msgid "edit opening_hours"
-#~ msgstr "Öffnungszeiten bearbeiten"
-
-#~ msgid "edit time-tag of selcted Element in a graphical interface"
-#~ msgstr "Zeit-Merkmal des ausgewählten Objekts grafisch bearbeiten."
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Segmente ausrichten.</b> Drücke <b><i><span style=\"color:green"
-#~ "\">"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "Fernsteuerung konnte nicht initialisiert werden."
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "Fernsteuerplugin ist nicht kompatibel mit {0}."
-
-#~ msgid ""
-#~ "{0} will work but remote control is disabled.\n"
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "You should update the plugins. If this does not help report a bug for "
-#~ "\"{0}\"."
-#~ msgstr ""
-#~ "{0} wird funktionieren, aber die Fernsteuerung ist abgeschaltet.\n"
-#~ "Aktuelle Version von \"{1}\": {2}, interne Version {3}. Brauche Version "
-#~ "{4}, interne Version {5}.\n"
-#~ "Sie sollten die Plugins aktualisieren. Falls das nicht hilft, melden Sie "
-#~ "bitte einen Fehler für \"{0}\"."
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Unbenannte WMS-Ebene"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Die Ebene unterstützt keine von JOSMs möglichen Projektionen, \n"
-#~ "deshalb kann sie nicht benutzt werden. \n"
-#~ "Diese Meldung wird nicht noch einmal angezeigt."
-
-#~ msgid "import data from URL"
-#~ msgstr "Daten von URL importieren"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "WMS-URL hinzufügen"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} wird funktionieren, aber die Fernsteuerung für das Plugin wurde "
-#~ "deaktiviert.\n"
-#~ "Die Plugins sollten aktualisiert werden."
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "Aktuelle Version von ''{1}'': {2}, interne Version {3}- Benötigte Version "
-#~ "{4}, interne Version {5}.\n"
-#~ "Falls Aktualisieren der Plugins nicht hilft, bitte einen Fehler für "
-#~ "''{0}'' melden."
-
-#~ msgid "Add relation"
-#~ msgstr "Relation hinzufügen"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr "Zoomstufe zur Bestimmung des Versatzes nicht ausreichend"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "WARNUNG: unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den "
-#~ "Informations- und Chronikseiten für OSM-Objekte wird wahrscheinlich "
-#~ "fehlschlagen. Die API-Basis-URL lautet: \"{0}\""
-
-#~ msgid "Get Capabilities"
-#~ msgstr "Serverfähigkeiten auslesen"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Browser mit Wiki-Hilfe zum gewählten Objekt öffnen"
-
-#~ msgid "Plugin for Seamap Editor"
-#~ msgstr "Plugin für Seekarteneditor"
-
-#~ msgid "Remote WMS"
-#~ msgstr "WMS-Server"
-
-#~ msgid "used"
-#~ msgstr "benutzt"
-
-#~ msgid "Seamap Editor"
-#~ msgstr "Seekarten Editor"
-
-#~ msgid "Phone"
-#~ msgstr "Telefonnummer"
-
-#~ msgid "Studio"
-#~ msgstr "Studio"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Bitte die WMS Ebene manuell mittels eines bekannt richtigen Objekts/"
-#~ "Straße/GPS Track ausrichten bevor Daten erfasst werden!"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "Die aktuelle Projektion ist jetzt {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "Projektion wurde von {0} auf {1} geändert."
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Höhenprofil für Track \""
-
-#~ msgid "Load file"
-#~ msgstr "Datei laden"
-
-#~ msgid "Seamarks"
-#~ msgstr "Seezeichen"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "Seezeichen erfassen"
-
-#~ msgid "Could not parse file. Not a PDF file?"
-#~ msgstr "Parsen der Datei fehlgeschlagen. Keine PDF-Datei?"
-
-#~ msgid "%s (%d)"
-#~ msgstr "Adressen ohne gültige Straße"
-
-#~ msgid "Post Code"
-#~ msgstr "PLZ"
-
-#~ msgid "Guess address data"
-#~ msgstr "Adressdaten vorschlagen"
-
-#~ msgid "Apply all guesses"
-#~ msgstr "Alle Vorschläge annehmen"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Verfügbare Stile (von {0}):"
-
-#~ msgid "it works realy fine"
-#~ msgstr "es funktioniert ziemlich gut"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "Durch Plugin {0} ersetzt"
-
-#~ msgid "OSM-Cert"
-#~ msgstr "OSM-Zertifikat"
-
-#~ msgid "set {0}"
-#~ msgstr "{0} aktivieren"
-
-#~ msgid "Add comment"
-#~ msgstr "Kommentar hinzufügen"
-
-#~ msgid "Re-open bug"
-#~ msgstr "Fehler erneut bearbeiten"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "Als nicht reproduzierbar markieren"
-
-#~ msgid "Close bug"
-#~ msgstr "Fehler schließen"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Fläche vereinfachen ({0} Knoten löschen)"
-#~ msgstr[1] "Fläche vereinfachen ({0} Knoten löschen)"
-
-#~ msgid "Experimental union of SlippyMap plugin and WMSPlugin"
-#~ msgstr ""
-#~ "Experimentelle Vereinigung der Plugins \"SlippyMap\" und \"WMSPlugin\""
-
-#~ msgid "alpine_hiking"
-#~ msgstr "T4 - schwieriger alpiner Steig"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "T5 - schwieriger alpiner Steig mit Kletterstellen"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "T6 - schwieriger, gefährlicher alpiner Steig mit Kletterstellen"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "T2 - anspruchsvoller Bergweg"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "T3 - exponierter, schwieriger Bergweg"
-
-#~ msgid "Key Signatures"
-#~ msgstr "Schlüsselsignaturen"
-
-#~ msgid "Key certified for OSM-Usage with comment:{0}"
-#~ msgstr "Schlüssel für die OSM-Nutzung mit Kommentar zertifiziert:{0}"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "Auszuführender GnuPG-Befehl:"
-
-#~ msgid "Privacy"
-#~ msgstr "Privatsphäre"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "Nach dem Schlüssel kein weiteres Mal fragen"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Fernsteuerung erlauben (erfordert remotecontrol-Plugin)"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Bitte wählen Sie mindestens zwei Knoten zum Vereinigen oder einen Knoten, "
-#~ "der nahe an einem anderen liegt."
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Einstellungen von WMSPlugin/SlippyMap übertragen"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Aktuelle Einstellungen behalten"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Mit Liste des WMSPlugins überschreiben"
-
-#~ msgid "Keep current list"
-#~ msgstr "Aktuelle Liste behalten"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "WMS Ebenenliste:"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "WMSPlugin-Einstellungen:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "SlippyMap-Einstellungen:"
-
-#~ msgid "Settings for the Remote Control freature."
-#~ msgstr "Einstellungen für die Fernsteuerungs-Funktion."
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Mit SlippyMap-Einstellungen überschreiben"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Mit WMSPlugin-Einstellungen überschreiben"
-
-#~ msgid ""
-#~ "JOSM will always listen on port 8111 on localhost.The port is not "
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
 #~ "configurable because it is referenced by external applications talking to "
 #~ "JOSM."
 #~ msgstr ""
-#~ "JOSM wird immer auf dem lokalen Port 8111 lauschen. Dieser Port kann "
-#~ "nicht angepasst werden, da er von externen Anwendungen zum Zugriff auf "
-#~ "JOSM genutzt wird."
-
-#~ msgid "Green"
-#~ msgstr "Grün"
-
-#~ msgid "Blue"
-#~ msgstr "Blau"
-
-#~ msgid "Yellow"
-#~ msgstr "Gelb"
-
-#~ msgid "Red"
-#~ msgstr "Rot"
-
-#~ msgid "Orange"
-#~ msgstr "Orange"
-
-#~ msgid "No colour"
-#~ msgstr "Keine Farbe"
-
-#~ msgid "White"
-#~ msgstr "Weiss"
-
-#~ msgid "Add offset bookmark"
-#~ msgstr "Versatz-Lesezeichen hinzufügen"
-
-#~ msgid "Violet"
-#~ msgstr "Violett"
-
-#~ msgid "Black"
-#~ msgstr "Schwarz"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Migration der Hintergrund-Einstellungen"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Warnung: Unerwartete Konflikt in den Einstellungen"
-
-#~ msgid "load imagery layers"
-#~ msgstr "Hintergrundebenen laden"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "Es gibt {0} unbekannte Einstellungen des Slippymap-Plugins"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "Es gibt {0} unbekannte WMSPlugin-Einstellungen"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
+#~ "JOSM lauscht immer am lokalen Port 8111. Dieser Port kann nicht geändert "
+#~ "werden, da externe Anwendungen darüber auf JOSM zugreifen."
+
+#~ msgid "Download referrers for the the chosen relation and its members"
 #~ msgstr ""
-#~ "Migration der Hintergrund-Einstellungen: Konflikt beim Verschieben des "
-#~ "Feldes {0} -> {1}"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
+#~ "Referrer der ausgewählten Relation mitsamt deren Mitglieder herunterladen"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Verdächtige Daten gefunden. Trotzdem hochladen?"
+
+#~ msgid "Adjacent ways will be selected. Nodes wiil be deselected."
 #~ msgstr ""
-#~ "Migration der Hintergrund-Einstellungen: Konflikt beim Verschieben der "
-#~ "Eigenschaft {0} -> {1}"
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: Problem mit Fernsteuerung"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Projektion \"{0}\" nicht vorhanden"
-
-#~ msgid "Amber"
-#~ msgstr "Bernstein"
-
-#~ msgid "(save current)"
-#~ msgstr "(Aktuelles speichern)"
-
-#~ msgid "T3 - difficult"
-#~ msgstr "T3 - exponierter, schwieriger Bergweg"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "Erlaubt das Ausführen von Skripten in JOSM."
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "Konturen von zwei Flächen verschmelzen"
-
-#~ msgid "MIME-Types:"
-#~ msgstr "MIME-Typen:"
-
-#~ msgid "Scripts"
-#~ msgstr "Skripte"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Ideale Zoomstufe: {0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Pixelmaßstab: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Aktuelle Zoomstufe: {0}"
-
-#~ msgid "Contour Merge"
-#~ msgstr "Konturen verschmelzen"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
+#~ "Angrenzende Linien werden ausgewählt. Punkte werden aus der Auswahl "
+#~ "entfernt."
+
+#~ msgid "unkown"
+#~ msgstr "unbekannt"
+
+#~ msgid ""
+#~ "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
+#~ "tune simplification"
 #~ msgstr ""
-#~ "Die Kontur einer Fläche mit der Kontur einer anderen Fläche verschmelzen"
-
-#~ msgid "Run the script"
-#~ msgstr "Skript ausführen"
-
-#~ msgid "Run"
-#~ msgstr "Ausführen"
-
-#~ msgid "File:"
-#~ msgstr "Datei:"
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "Namen einer Skriptdatei eingeben"
-
-#~ msgid "Run..."
-#~ msgstr "Ausführen ..."
-
-#~ msgid "Run a script"
-#~ msgstr "Skript ausführen"
-
-#~ msgid "Script Error"
-#~ msgstr "Skript-Fehler"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "Skriptausführung fehlgeschlagen."
-
-#~ msgid "Empty file name"
-#~ msgstr "Leerer Dateiname"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "Bitte zuerst einen Dateinamen eingeben."
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "Die Skriptdatei \"{0}\" existiert nicht."
-
-#~ msgid "File not readable"
-#~ msgstr "Datei nicht lesbar"
-
-#~ msgid "The script file ''{0}'' isn't readable."
-#~ msgstr "Die Skriptdatei \"{0}\" ist nicht lesbar."
-
-#~ msgid "cancel"
-#~ msgstr "Abbrechen"
-
-#~ msgid "Select a script"
-#~ msgstr "Skript auswählen"
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "Makro-Ausführung fehlgeschlagen."
-
-#~ msgid "Language version:"
-#~ msgstr "Sprachversion:"
-
-#~ msgid "Language:"
-#~ msgstr "Sprache:"
-
-#~ msgid "Version:"
-#~ msgstr "Version:"
-
-#~ msgid "remove entry"
-#~ msgstr "Eintrag entfernen"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "Neuen WMS/TMS-Eintrag mittels URL anlegen"
-
-#~ msgid "Internal Style"
-#~ msgstr "Interner Stil"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Zoomstufe: {0}"
-
-#~ msgid ""
-#~ "Projection code mismatch in '{0}': toCode() returns ''{1}'', expected "
-#~ "''{2}''"
-#~ msgstr ""
-#~ "Diskrepanz im Projektionskode für '{0}': toCode() liefert ''{1}'', "
-#~ "erwartet wird ''{2}''."
-
-#~ msgid ""
-#~ "Bad implementation of '{0}' projection class: cannot set preferences to "
-#~ "match code ''{1}''"
-#~ msgstr ""
-#~ "Schlechte Implementierung der Projektion '{0}': Einstellungen für Kode "
-#~ "''{1}'' konnen nicht erzeugt werden."
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Lick-Klick: Node auswählen"
-
-#~ msgid "Scripting"
-#~ msgstr "Skripting"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "Accept the selected scripting engine"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "Eingebauter Stil, interner Pfad:</b>"
-
-#~ msgid "No script engine"
-#~ msgstr "Keine Skript-Engine"
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "Lesen des Makros aus Datei ''{0}'' gescheitert."
-
-#~ msgid "IO error"
-#~ msgstr "E/A-Fehler"
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "Lesen des Skripts aus Datei ''{0}'' gescheitert."
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "Die Skriptdatei ''{0}'' kann nicht gelesen werden."
-
-#~ msgid "Configure..."
-#~ msgstr "Konfigurieren..."
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "Skripteinstellungen konfigurieren"
-
-#~ msgid "Script engines"
-#~ msgstr "Skript-Engines"
-
-#~ msgid "Launch file selection dialog"
-#~ msgstr "Dateiauswahl-Dialog aufrufen"
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "''{0}'' ist nicht vorhanden."
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "Skript-Engines und Skripte konfigurieren"
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr ""
-#~ "''{0}'' ist ein Verzeichnis. Erwartet wird stattdessen eine jar-Datei."
-
-#~ msgid "JAR file"
-#~ msgstr "JAR-Datei"
-
-#~ msgid "Remove the selected jar files"
-#~ msgstr "Die ausgewählten jar-Dateien entfernen"
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM unterstützt zur Zeit folgende Skript-Engines:"
-
-#~ msgid "Available script engines"
-#~ msgstr "Verfügbare Skript-Engines"
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "Eine jar-Datei hinzufügen, welche eine Skript-Engine bereitstellt"
-
-#~ msgid "Select a jar file"
-#~ msgstr "Wählen Sie eine jar-Datei aus"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "Ablegen zum Ausrichten am Zielsegment"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Kontur zusammenführen"
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>Das Skript konnte nicht ausgeführt werden, da derzeit keine Skripting-"
-#~ "Engines installiert sind.</p><p>Lesen Sie die Online-Hilfe, um "
-#~ "Informationen zum Installieren einer Skripting-Engine mit JOSM zu "
-#~ "erhalten.</p>"
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr "Warnung: Laden von MIME-Typen aus der Datei ''0'' fehlgeschlagen."
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
-#~ msgstr ""
-#~ "Warnung: Laden von Standard-MIME-Typen aus der Ressource ''0'' "
-#~ "fehlgeschlagen."
-
-#~ msgid "Please select a scripting engine to execute the selected script."
-#~ msgstr ""
-#~ "Um das ausgewählte Skript auszuführen, wählen Sie bitte eine Skripting-"
-#~ "Engine aus."
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-#~ msgstr ""
-#~ "''{0}'' kann nicht gelesen werden. Eine Skript-Engine kann aus dieser "
-#~ "Datei nicht geladen werden."
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr ""
-#~ "Die JAR-Datei ''{0}'' stellt keine Skript-Engine bereit. Der Eintrag "
-#~ "''{1}'' fehlt."
-
-#~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
-#~ msgstr ""
-#~ "Öffnen der Datei ''{0}'' als JAR-Datei fehlgeschlagen. Eine Skript-Engine "
-#~ "kann aus dieser Datei nicht geladen werden."
-
-#~ msgid "JAR files"
-#~ msgstr "JAR-Dateien"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr ""
-#~ "Wählen Sie eine Skriptdatei aus und klicken Sie auf <strong>Ausführen</"
-#~ "strong>."
-
-#~ msgid "Launch file chooser"
-#~ msgstr "File Chooser einrichten"
-
-#~ msgid "{1} (with engine {0})"
-#~ msgstr "{1} (mit Engine {0})"
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr ""
-#~ "Geben Sie zusätzliche JAR-Dateien ein, die Skript-Engines bereitstellen."
-
-#~ msgid "lane"
-#~ msgstr "Fahrbahn"
-
-#~ msgid "parking_lot"
-#~ msgstr "Parkbucht"
-
-#~ msgid "sidewalk"
-#~ msgstr "Fußweg"
-
-#~ msgid "Opens advanced relation/multipolygon editor panel"
-#~ msgstr "Erweitertes Bedienfeld für Relations-/Multipolygon-Editor öffnen"
-
-#~ msgid "Open Relation Editor"
-#~ msgstr "Relationseditor öffnen"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Im folgenen erscheinen Automatische Prüfergebnisse. Versuchen Sie diese "
-#~ "mit Vorsicht zu beheben (zerstören Sie keine gültigen Daten). Im "
-#~ "Zweifelsfall ignorieren Sie die Anzeige.<br>Wenn Sie diesen Dialog "
-#~ "beenden, finden Sie die Einträge zur Analyse in der seitlichen Anzeige "
-#~ "der Prüfergebnisse."
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Warnung: Linie {0} wird gelöscht, da die Anzahl der Punkte {1} ist. Es "
-#~ "werden aber min. 2 Punkte benötigt."
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Links-Klick: Punktauswahl löschen"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "Ein isolierter Punkt kann nicht ausgewählt werden"
-
-#~ msgid "Left-Click: on node to select/unselect; Drag: drag way slice"
-#~ msgstr ""
-#~ "Links-Klick: auf Punkt zum Auswählen/Abwählen; Ziehen: Linienstücke ziehen"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Bewege einen Linienabschnitt, um ein Rechteck zu erstellen. <Strg>"
-#~ "+Bewegen zum Verschieben des Linienabschnittes entlang seiner Senkrechten."
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Einfügen von Zwischenobjekten aus der Zwischenablage"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr ""
-#~ "Ziehen Sie den Linienabschnitt, um ihn auf dem Zielabschnitt abzulegen"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr ""
-#~ "Ziehen/Ablegen: Ziehen Sie den Linienabschnitt, um ihn auf dem "
-#~ "Zielabschnitt abzulegen"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Willkommen beim</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span>-Plugin (Linienausrichten-Plugin)<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...oder bessergesagt sollte es <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span>-Plugin "
-#~ "(Linienabschnittausrichten-Plugin) genannt werden...</span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid "Number of {0]-ways junctions found: "
-#~ msgstr "Anzahl der gefundenen {0}-Linien-Kreuzungen: "
-
-#~ msgid "Analyzing"
-#~ msgstr "Analyiseren"
-
-#~ msgid "Loading from Quick History Service"
-#~ msgstr "Vom Objektgeschichtsdienst laden"
-
-#~ msgid "Makes a paralell copy of the selected way(s)"
-#~ msgstr "Erzeugt eine parallele Kopie der(/des) ausgewählten Wege(s)"
-
-#~ msgid "Eps={0}"
-#~ msgstr "Eps={0}"
-
-#~ msgid ""
-#~ "Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}, Version: "
-#~ "{4}"
-#~ msgstr ""
-#~ "Datensatz {0}; Autor: [{1}]; Änderungssatz ID: {2}; Zeit: {3}; Version: "
-#~ "{4}"
-
-#~ msgid "Can't parse a time from this string."
-#~ msgstr "Von dieser Zeichenkette konnte keine Uhrzeit geparst werden."
-
-#~ msgid ""
-#~ "The GPX file doesn't contain valid trackpoints. Please use a GPX file "
-#~ "that has trackpoints."
-#~ msgstr ""
-#~ "Die GPX-Datei enthält keine gültigen Streckenpunkte. Bitte verwenden Sie "
-#~ "eine GPX-Datei mit Streckenpunkten."
-
-#~ msgid "Couldn't find built-in ruleset {0}"
-#~ msgstr "Eingebauter Regelsatz {0} konnte nicht gefunden werden"
-
-#~ msgid "Condition isn't finished at </condition> tag"
-#~ msgstr "Bedingung ist am </condition>-Element noch nicht beendet"
-
-#~ msgid ""
-#~ "Lengths must be given as positive decimal numbers with unit \"m\", \"km"
-#~ "\", \"mi\" or without unit.\n"
-#~ "Alternatively, the format FEET' INCHES\" can be used."
-#~ msgstr ""
-#~ "Längen müssen als positive Dezimalzahl mit den Einheiten ''m'', ''km'', "
-#~ "''mi'' oder ohne Einheit angegeben werden."
-
-#~ msgid ""
-#~ "Surface values must not contain any of the following characters: ',' '{' "
-#~ "'}' '=' '|"
-#~ msgstr ""
-#~ "Oberflächen-Werte dürfen keine der folgenden Zeichen enthalten: ',' '{' "
-#~ "'}' '=' '|"
-
-#~ msgid ""
-#~ "TMS layers do not support the projection {1}.\n"
-#~ "{2}\n"
-#~ "Change the projection or remove the layer."
-#~ msgstr ""
-#~ "TMS-Ebenen unterstützen die Projektion {1} nicht.\n"
-#~ "{2}\n"
-#~ "Bitte die Projektion ändern oder die Ebene entfernen."
-
-#~ msgid "license validation other"
-#~ msgstr "Lizenzprüfung: Information"
-
-#~ msgid "license validation error"
-#~ msgstr "Lizenzprüfung: Fehler"
+#~ "Drücken Sie die Eingabetaste für eine vereinfachte Darstellung oder zum "
+#~ "Speichern, Strg+Eingabetaste zum Speichern mit Schlagwörtern, Hoch/Runter "
+#~ "zum Justieren der vereinfachten Darstellung."
+
+#~ msgid "Wxternal ruleset directory:"
+#~ msgstr "Wxternal Regelsatzverzeichnis:"
+
+#~ msgid "GraphView default node"
+#~ msgstr "Graphenanzeige-Standardpunkt"
+
+#~ msgid "Graphview default segment"
+#~ msgstr "Graphenanzeige-Standardabschnitt"
 
 #~ msgid ""
 #~ "Surface values must not contain any of the following characters: '','', "
-#~ "''{'',  ''}'', ''='', ''|''"
+#~ "'''{''',  '''}''', ''='', ''|''"
 #~ msgstr ""
 #~ "Oberflächenwerte dürfen folgende Zeichen nicht enthalten: '','', ''{'', "
 #~ "''}'', ''='', ''|''"
 
-#~ msgid "license validation warning"
-#~ msgstr "Lizenzprüfung: Warnung"
-
-#~ msgid "Eps={0}, {1} points"
-#~ msgstr "Eps={0}, {1} Punkte"
-
 #~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
+#~ "Depending on your Operating Stystem / Distribution, you may have to "
+#~ "create a default keyring / wallet first."
 #~ msgstr ""
-#~ "Geben sie die Koordinaten für den neuen Punkt ein.<br>Längen- und "
-#~ "Breitengrad werden durch Leerzeichen, Komma oder Semikolon getrennt."
-#~ "<br>Koordinaten kann in drei unterschiedlichen Formaten vorliegen: "
-#~ "<ul><li><i>Grad</i><tt>&deg;</tt></li><li><i>Grad</i><tt>&deg;</tt> "
-#~ "<i>Minuten</i><tt>&#39;</tt></li><li><i>Grad</i><tt>&deg;</tt> "
-#~ "<i>Minuten</i><tt>&#39;</tt> <i>Sekunden</i><tt>&quot</tt></li></"
-#~ "ul>Symbole<tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> sind optional.<br/><br/>Einige Beispiele:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
+#~ "Abhängig von Betriebssystem oder Distribution muss zuerst möglicherweise "
+#~ "eine Brieftasche oder Schlüsselring angelegt werden."
+
+#~ msgid "Transfer to password manager and remove from prefence file"
 #~ msgstr ""
-#~ "Dieser Test findet mehrsprachige Objekte, deren Attribut ''name'' weder "
-#~ "mit einem ''name:*'' Attribut, noch mit einer Komposition von ''name:*'' "
-#~ "Attributen übereinstimmt. Beispiel: Italia - Italien - Italy."
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Doppelte Belegung für Taste ''{0}'' - Taste wird ignoriert!"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Richtungsindex ''{0}'' nicht gefunden"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Ein weiteres Plugin, um Wegpunkten in einer GPX-Datei Bilder zuzuordnen. "
-#~ "Eine Übereinstimmung wird gefunden, wenn eines der Attribute ''name', "
-#~ "''cmt'' oder ''desc'' eines Wegpunktes mit dem Dateinamen des Bildes "
-#~ "übereinstimmt."
-
-#~ msgid ""
-#~ "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to "
-#~ "grab."
-#~ msgstr ""
-#~ "Das \"Tableau(x) d’assemblage\" in die Liste der zu holenden "
-#~ "Katasterseiten aufnehmen."
-
-#~ msgid "Erase and transfer to password manager"
-#~ msgstr "Löschen und zu Passwortverwaltung übertragen"
-
-#~ msgid ""
-#~ "Fatal: unexpected response from HTTP server. Got {0} response without "
-#~ "'Location' header. Can''t redirect. Aborting."
-#~ msgstr ""
-#~ "Fatal: Unerwartete Rückmeldung von HTTP-Server. {0}-Rückmeldung ohne "
-#~ "'Standort'-Kopfdaten. Weiterleitung kann nicht durchgeführt werden. "
-#~ "Abbruch."
-
-#~ msgid "Fatal: too many redirects to the download URL detected. Aborting."
-#~ msgstr "Fatal: Zu viele Weiterleitungen zur Download-URL erkannt. Abbruch."
-
-#~ msgid ""
-#~ "Error: failed to read from ''{0}''. Server responded with status code {1}."
-#~ msgstr ""
-#~ "Fehler: Lesen von ''{0}'' fehlgeschlagen. Server antwortete mit dem "
-#~ "Statuscode {1}."
+#~ "Zur Passwortverwaltung transferieren und aus Einstellungsdatei entfernen"
+
+#~ msgid "Global settings"
+#~ msgstr "Globale Einstellungen"
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 26529)
+++ applications/editors/josm/i18n/po/el.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 15:55+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:33+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:34+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Βοήθεια"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Προειδοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Η παράμετρος \"downloadgps\" δεν δέχεται ονόματα ή URL αρχείων"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -135,13 +136,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Έξοδος από το JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -161,7 +162,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -171,6 +172,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,5 +202,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -379,6 +380,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -405,5 +406,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -411,7 +412,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -419,5 +421,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -627,5 +629,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -875,5 +877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -882,5 +884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1062,6 +1064,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1213,5 +1215,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1432,6 +1434,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2077,5 +2079,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2387,7 +2389,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Μεταφόρτωση δεδομένων"
@@ -2644,5 +2646,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2768,10 +2770,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2932,5 +2934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3495,5 +3497,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3544,40 +3546,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
+msgid "Set {0}={1} for node ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
-#, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3700,4 +3702,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3994,6 +3997,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4030,5 +4033,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4132,5 +4135,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4232,5 +4235,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4249,8 +4252,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4390,50 +4393,64 @@
 msgstr "Γεωγραφικό WGS84"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Ζώνη Lambert (Εσθονία)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Μερκατορικός"
@@ -4458,80 +4475,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Ελβετικό πλέγμα (Ελβετία)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4753,45 +4790,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5060,5 +5097,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5083,5 +5120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5092,5 +5129,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5496,5 +5533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5560,5 +5597,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "Οδός ταχείας κυκλοφορίας"
@@ -5566,5 +5603,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5572,10 +5609,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "υδατοδιαδρομή"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "χρήση γής"
@@ -5585,5 +5622,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5597,5 +5634,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5608,5 +5645,5 @@
 msgstr "μέσα μαζικής μεταφοράς"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5962,5 +5999,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6069,4 +6106,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6165,5 +6203,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6206,5 +6244,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6491,6 +6529,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6721,10 +6759,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Διατήρηση των συντεταγμένων μου"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Διατήρηση των συντεταγμένων τους"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6780,6 +6818,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6801,6 +6839,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7187,5 +7225,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7424,5 +7462,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7636,7 +7674,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "άγνωστο"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7900,5 +7968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7918,5 +7986,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7933,5 +8001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7939,5 +8007,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -7980,5 +8048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7986,5 +8054,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8179,5 +8247,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8277,5 +8345,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Χρήστης"
@@ -9269,5 +9336,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9449,5 +9516,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9590,4 +9657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9599,4 +9667,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9859,9 +9933,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9870,13 +9944,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9889,18 +9963,19 @@
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Αλλαγή τιμών;"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9909,5 +9984,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9917,5 +9992,5 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9924,28 +9999,32 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Ιδιότητες/Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9954,62 +10033,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10073,8 +10152,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10097,5 +10178,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10425,9 +10506,4 @@
 msgstr "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10467,10 +10543,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10749,37 +10819,4 @@
 msgstr "Τύπος"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "άγνωστο"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10895,20 +10932,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -11000,5 +11037,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11537,8 +11574,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11940,4 +11977,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11963,11 +12001,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12044,38 +12075,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Προσαρμογή Χρώματος"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Επιλέξτε ένα χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Όνομα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Περιγραφή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12086,9 +12117,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12096,26 +12127,26 @@
 msgstr "Περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12124,8 +12155,8 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12134,12 +12165,12 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "σημείο gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12148,10 +12179,10 @@
 msgstr[1] "{0} τροχιές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12159,78 +12190,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12241,12 +12272,12 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12254,6 +12285,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12261,27 +12292,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Σημάδια από Ονομασμένα Σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Εισαγωγή Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12291,29 +12322,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Αρχεία Κυματομορφής (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Σημάδια ήχου από {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Εισαγωγή εικόνων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12417,5 +12448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12425,57 +12456,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Φόρτωση πλακιδίου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Φόρτωση όλων των πλακιδίων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Άυξηση ζουμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Μείωση ζουμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13003,10 +13042,10 @@
 msgstr "Εικόνες JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "σημάδι gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13014,5 +13053,5 @@
 msgstr[1] "σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13021,22 +13060,22 @@
 msgstr[1] "{0} αποτελείται από {1} σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 "Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Συγχρονισμός ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13045,5 +13084,5 @@
 "συγχρονισμού."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13051,14 +13090,14 @@
 msgstr "Ήχος συγχρονισμένος στο σημείο {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13082,14 +13121,14 @@
 msgstr "Αδυναμία δημιουργίας νέου σημαδιού ήχου."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 "Παρουσιάστηκε σφάλμα κατά την προσπάθεια προβολής URL για αυτό το σημάδι"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "Το URL ήταν: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Σφάλμα στην εμφάνιση του URL"
@@ -14028,63 +14067,63 @@
 msgstr "Χρώματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Σχεδιασμός Βελών Κατεύθυνσης"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Σημεία GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14092,19 +14131,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14112,15 +14151,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Δεδομένα OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Κανένα"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Χρηση καθολικών ρυθμίσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14131,47 +14206,39 @@
 msgstr "Όλα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Τοπικά αρχεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Κανένα"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Σχεδιασμός μεγάλων σημείων GPS."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Ταχύτητα (κόκκινο = αργό, πράσινο = γρήγορο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14179,5 +14246,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14201,5 +14268,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14242,5 +14309,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14254,38 +14321,18 @@
 msgstr "Πεζοί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14294,10 +14341,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14305,10 +14352,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14317,25 +14364,25 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Μέγιστο μήκος (μέτρα)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14343,14 +14390,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Ελάχιστη απόσταση (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14358,13 +14405,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14372,27 +14419,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15053,5 +15118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15143,5 +15208,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Μηδενισμός"
@@ -15418,5 +15483,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15802,5 +15867,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15829,9 +15894,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16111,6 +16176,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16433,5 +16498,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16643,5 +16708,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17031,4 +17096,9 @@
 msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17827,4 +17897,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -17945,4 +18017,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18508,5 +18594,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34810,4 +34896,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34824,6 +34911,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34842,15 +34929,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "Συντμημένο όνομα οδού"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "ετικέτα μονόδρομου σε κόμβο"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "ετικέτα γέφυρας σε κόμβο"
@@ -34861,12 +34948,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "λάθος ετικέτα αυτοκινητοδρόμου σε κόμβο"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr ""
@@ -34875,16 +34962,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr ""
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr ""
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr ""
@@ -34894,10 +34981,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr ""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -34906,10 +34993,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr ""
@@ -34918,35 +35005,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr ""
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "ετικέτα επιπέδου με σήμα +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr ""
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "σχέση χωρίς τύπο"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "εστιατόριο χωρίς όνομα"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "ασυνήθηστος συνδυασμός ετικετών"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35051,117 +35147,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Χάρτες NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "Χάρτες NPE (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35406,6 +35512,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Ακυρώθηκε η αποστολή"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35507,9 +35613,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35527,23 +35633,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35551,26 +35687,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Πληροφορίες"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35578,5 +35742,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35687,9 +35851,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35788,17 +35952,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36429,28 +36610,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36568,9 +36756,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Αντικατάσταση του αρχικού λευκού φόντου με το χρώμα φόντου που ορίζεται στις "
-"προτιμήσεις του JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37458,5 +37644,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37466,17 +37652,17 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
@@ -37628,5 +37814,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37634,10 +37820,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37646,5 +37832,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37653,6 +37839,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37661,9 +37847,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37822,71 +38008,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37894,32 +38088,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -37954,6 +38142,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38084,30 +38272,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38805,5 +39006,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38820,5 +39021,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39552,17 +39753,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39576,36 +39777,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40227,5 +40424,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41193,4 +41390,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41410,6 +41624,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41656,5 +41870,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42225,5 +42439,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42609,1688 +42823,23 @@
 msgstr ""
 
-#~ msgid "Do not show again"
-#~ msgstr "Να μην εμφανιστεί ξανά"
+#~ msgid "Change values?"
+#~ msgstr "Αλλαγή τιμών;"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Ακυρώθηκε η αποστολή"
 
 #~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Μια μη αναμενόμενη εξαίρεση έγινε.\n"
-#~ "\n"
-#~ "Αυτό είναι πάντα ένα σφάλμα στο κώδικα. Εάν τρέχεις τη τελευταία\n"
-#~ "έκδοση του JOSM, παρακαλώ σκέψου να είσαι καλός και να κάνεις μια αναφορά "
-#~ "για bug."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
-#~ "οποία πήρατε το JOSM για το πρόβλημα."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Άνοιγμα πακέτου αλλαγών..."
-
-#~ msgid "Preparing..."
-#~ msgstr "Προετοιμασία..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών"
-
-#~ msgid "Uploading..."
-#~ msgstr "Αποστολή..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Άγνωστη έκδοση"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> έχει μηδενική αναφορά"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Προετοιμασία δεδομένων..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Άγνωστο αντικείμενο με id=0"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Δεν βρέθηκε το πρόσθετο: {0}."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Το πρόσθετο απαιτεί ενημέρωση του JOSM: {0}."
-
-#~ msgid "Enter Password"
-#~ msgstr "Εισάγετε κωδικό"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Μη αποθηκευμένες αλλαγές"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Ποσότητα Αγωγών"
-
-#~ msgid "Shop"
-#~ msgstr "Κατάστημα"
-
-#~ msgid "Cycleway"
-#~ msgstr "Ποδηλατόδρομος"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Ένα από τα επιλεγμένα αρχεία ήταν μηδενικό !!!"
-
-#~ msgid "Open an other photo"
-#~ msgstr "Άνοιγμα άλλης φωτογραφίας"
-
-#~ msgid "All images"
-#~ msgstr "Όλες οι εικόνες"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Υπήρξαν προβλήματα με τα παρακάτω πρόσθετα:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} Το πρόσθετο ενημερώθηκε επιτυχώς. Παρακαλώ επανεκινήστε το JOSM"
-#~ msgstr[1] ""
-#~ "{0} Τα πρόσθετα ενημερώθηκαν επιτυχώς. Παρακαλώ επανεκινήστε το JOSM"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr ""
-#~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Προειδοποίηση - ζητήθηκε η φόρτωση του {0} πρόσθετου. Το πρόσθετο δεν "
-#~ "χρειάζεται πλέον."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η "
-#~ "προειδοποίηση εμφανίζεται <br>θέτωντας την επιλογή 'pluginmanager."
-#~ "warntime' στην διαμόρφωση.)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Διακοπή..."
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Προσπαθήστε να αναβαθμίσετε στην τελευταία έκδοση του JOSM και όλων των "
-#~ "πρόσθετων πριν αναφέρετε bug."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Άδειο μέλος στη σχέση."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Σφάλμα: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Προειδοποίηση: {0}"
-
-#~ msgid "Rotate"
-#~ msgstr "Περιστροφή"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Move"
-#~ msgstr "Μετακίνηση"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Αποτυχία εισαγωγής NMEA!"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Άγνωστες προτάσεις: "
-
-#~ msgid "File could not be found."
-#~ msgstr "Το αρχείο δεν βρέθηκε."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Αποστολή προς OSM..."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Να αποσταλούν αυτές οι αλλαγές;"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση."
-
-#~ msgid "Uploading data"
-#~ msgstr "Αποστολή δεδομένων"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Άγνωστη επέκταση αρχείου."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Δεν ήταν δυνατή η μετονομασία του αρχείου \"{0}\"."
-
-#~ msgid "Next Marker"
-#~ msgstr "Επόμενο σημάδι"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Προηγούμενο σημάδι"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Αναπαραγωγή προηγούμενου σημαδιού."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Πιο αργά μπροστά"
-
-#~ msgid "Jump forward"
-#~ msgstr "Άλμα μπροστά"
-
-#~ msgid "Jump back."
-#~ msgstr "Άλμα πίσω."
-
-#~ msgid "Load Selection"
-#~ msgstr "Φόρτωση επιλογής"
-
-#~ msgid "Downloading..."
-#~ msgstr "Λήψη..."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης."
-
-#~ msgid "No data imported."
-#~ msgstr "Δεν εισήχθησαν δεδομένα"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Άνοιγμα σε Φυλλομετρητή"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Επιλέξτε, μετακινήστε και περιστρέψτε αντικείμενα"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Χρησιμοποιήστε δεκαδικές μοίρες"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Αρνητικές τιμές υποδεικνείουν  Δυτικό/Νότιο ημισφαίριο."
-
-#~ msgid "File not found"
-#~ msgstr "Το αρχείο δεν βρέθηκε"
-
-#~ msgid "to"
-#~ msgstr "εώς"
-
-#~ msgid "y from"
-#~ msgstr "y από"
-
-#~ msgid "Download Area"
-#~ msgstr "Λήψη Περιοχής"
-
-#~ msgid "x from"
-#~ msgstr "x από"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Πηγές και Τύποι δεδομένων"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Η ενεργοποίηση των ενημερωμένων πρόσθετων απέτυχε. Ελέγξτε αν το JOSM "
-#~ "έχει άδεια αντικατάστασης των υπαρχόντων."
-
-#~ msgid "Set the language."
-#~ msgstr "Ρυθμίστε την γλώσσα."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Οι παράμετροι διαβάζονται με τη σειρά που καθορίζονται, γι' αυτό "
-#~ "σιγουρευτείτε\n"
-#~ "ότι φορτώσατε δεδομένα πριν το --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr ""
-#~ "Αντί για το --download=<bbox> μπορείτε να καθορίσεται το osm://<bbox>\n"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Επικοινωνία με τον διακομιστή OSM..."
-
-#~ msgid "Length: "
-#~ msgstr "Μήκος: "
-
-#~ msgid "name"
-#~ msgstr "όνομα"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "σημείο"
-#~ msgstr[1] "σημεία"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} σημείο"
-#~ msgstr[1] "{0} σημεία"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} διαγράφηκαν.)"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Εικόνες για {0}"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Αρχή GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Τέλος GPS: {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Ανάγνωση GPX..."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "εικόνα"
-#~ msgstr[1] "εικόνες"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Μέγιστο μήκος (σε μέτρα) γαι τον σχεδιασμό γραμμών. Θέστε σε '-1' για τον "
-#~ "σχεδιασμό όλων των γραμμών."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr "Το πρόσθετο {0} μοιάζει χαλασμένο ή δεν μπόρεσε να ληφθεί αυτόματα."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Ενημέρωση πρόσθετων"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Αδυναμία λήψης πρόσθετου: {0} από {1}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Συμπεριλάβετε τα βήματα ποθ οδήγησαν στο σφάλμα (όσο πιο λεπτομερώς "
-#~ "γίνεται)!"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Βεβαιωθείτε ότι συμπεριλάβατε τις ακόλουθεσ πληροφορίες:"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Να μην εφαρμοστούν οι αλλαγές"
-
-#~ msgid "position"
-#~ msgstr "θέση"
-
-#~ msgid "different"
-#~ msgstr "διαφορετικά"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Η προβολή \"{0}\" είναι σχεδιασμένη για\n"
-#~ "γεωγραφικά πλάτη από 46.1° και 57° μόνο.\n"
-#~ "Χρεισημοποιήστε άλλο σύστημα προβολής αν δεν χρησιμοποιείτε\n"
-#~ "Γαλλικό διακομιστή WMS.\n"
-#~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Ζώνη Labert (Γαλλία)"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Η επιλογή \"{0}\" χρησιμοποιείται από την σχέση \"{1}\" με ρόλο {2}.\n"
-#~ "Διαγραφή από την σχέση;"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Κακοσχηματισμένες προτάσεις: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Μηδενικές συντεταγμένες: "
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Αυτοι οι κόμβοι δεν βρίσκονται σε κύκλο."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Εσωτερικό σφάλμα: αδύνατος ο έλεγχος συνθηκών για κανένα επίπεδο. "
-#~ "Παρακαλώ αναφέρετε το σαν σφάλμα."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να "
-#~ "τους συγχωνεύσετε;"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Συγχώνευση κόμβων  με διαφορετικές συμμετοχές;"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Αναμενόταν κλείσιμο παρένθεσης."
-
-#~ msgid "Faster Forward"
-#~ msgstr "Γρηγορότερα μπροστά"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Μόνο ένας κόμβος επιλέχθηκε"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Επιτρέπονται μόνο δύο κόμβοι"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες"
-
-#~ msgid "Data Layer"
-#~ msgstr "Επίπεδο δεδομένων"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Το αρχείο προτιμήσεων είχε σφάλματα. Δημιουργείται αντίγραφο ασφαλείας "
-#~ "στο {0}."
-
-#~ msgid "layer not in list."
-#~ msgstr "το επίπεδο δεν είναι στη λίστα."
-
-#~ msgid "Timespan: "
-#~ msgstr "Διάρκεια: "
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Συγχρονισμός ρολογιού"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Παρακαλώ λάβετε υπ' όψιν ότι τα πλήκτρα συτομεύσεων αντιστοιχούντε σε "
-#~ "ενέργειεσ όταν το  JOSM ξεκινάει. Πρέπει να κάνετε<b>επανεκκίνηση</b> του "
-#~ "JOSM για να δείτε τις αλλαγές σας.</p>"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Ευχαρστούμε για την κατανόηση</p>"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Όνομα χρήστη (email) για τον λογαριασμό OSM."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί "
-#~ "ο κωδικός."
-
-#~ msgid "No plugin information found."
-#~ msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσία"
-#~ msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Ρύθμιση τοποθεσιών..."
-
-#~ msgid "OSM password"
-#~ msgstr "Κωδικός OSM"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Όνομα χρήστη OSM (email)"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Σφάλμα κατά την διαγραφή του αρχείου πρόσθετου: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Το πρόσθετο υπάρχει ήδη"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Έκδοση {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Ενημερώστε τα ακόλουθα πρόσθετα:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Λήψη των παρακάτω πρόσθετων;\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Σφάλμα κατά την ανάγνωση αρχείου πληροφοριών πρόσθετου: {0}"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Δημιουργία αντιγράφων ασφαλείας"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Ρυθμίσεις διαμεσολαβητή"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Ενεργοποίηση διαμεσολαβητή"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Όνομα χρήστη διαμεσολαβητή"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Κωδικός διαμεσολαβητή"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Επεξεργασία νέας σχέσης"
-
-#~ msgid "Create new relation"
-#~ msgstr "Δημιουργία νέας σχέσης"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Επεξεργασία σχέσης #{0}"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Μέλη: {0}"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη"
-
-#~ msgid "Add Selected"
-#~ msgstr "Προσθήκη επιλεγμένων"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Αδυναμία σύνδεσης με το διακομιστή"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "Υπάρχουν μη αποθηκευμένες αλλαγές. Διαγραφή οτυ επιπέδου οποσδήποτε;"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε όλο το επίπεδο;"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Διαγραφή του επιλεγμένου επιπέδου."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Επεξεργασία Ιδιοτήτων"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Επαναφορά της κατάστασης όλων των επιλεγμένων αντικειμένων στην έκδοση "
-#~ "που έχει απιλεγεί στη λίστα ιστορικού."
-
-#~ msgid "their version:"
-#~ msgstr "η έκδοση τους:"
-
-#~ msgid "my version:"
-#~ msgstr "η έκδοση μου:"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Δεν έχει υλοποιηθεί ακόμη."
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Εισαγωγή αρχείου TCX..."
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "Request Update"
-#~ msgstr "Αίτηση  Ενημέρωσης"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Εμφάνιση κατάστασης πλακιδίου"
-
-#~ msgid "image not loaded"
-#~ msgstr "η εικόνα δεν φορτώθηκε"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Πηγές Πλακιδίων"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Προτιμήσεις πρόσθετου WMS"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Δημιοθργήθηκε εξαίρεση"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Λήψη πλακιδίου WMS από {0}"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Βοήθεια πρόσθετου WMS"
-
-#~ msgid "help"
-#~ msgstr "βοήθεια"
-
-#~ msgid "Navigation"
-#~ msgstr "Πλοήγηση"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Διαγραφή {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Διαγραφή {1} {0}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Η επιλογή \"{0}\" χρησιμοποιείτε από την σχέση \"{1}\"\n"
-#~ "Διαγραφή απο την σχέση;"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Χρησιμοποιείτε την προβολή EPSG:4326 η οποία μπορεί να "
-#~ "οδηγήσει<br>ανεπιθύμητα αποτελέσματα όταν γίνονται ορθογώνιες "
-#~ "ευθυγραμμίσεις.<br>Αλλάξτε την προβολή για να μην ξαναεμφανιστεί αυτό το "
-#~ "μήνυμα .<br>Θέλετε να συνεχίσετε;"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Online βοήθεια του JOSM"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Λήψη πρόσθετων που λείπουν"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Το αρχείο του πρόσθετου είναι ήδη διαθέσιμο. Θέλετε να λάβετε την "
-#~ "τρέχουσα έκδοση διαγράφοντας το υπάρχον αρχείο;\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Διεύθυνση μεσολαβητή"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Θύρα μεσολαβητή"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Συγχώνευση του αμέσως επόμενου επιπέδου στο επιλεγμένο επίπεδο."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Κατεχόμενο από"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Κενή τιμή διαγράφει το κλειδί."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ανανέωση της λίστας επιλεγμένων."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, πιθανόν να λείπουν κάποιες ετικέτες"
-
-#~ msgid "Commit comment"
-#~ msgstr "Οριστικοποίηση σχολίου"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Κακοσχηματισμένο id κόμβου"
-
-#~ msgid "zoom level"
-#~ msgstr "Επίπεδο ζουμ"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Βρέθηκε <member> στοιχείο εκτός σχέσης."
-
-#~ msgid "S"
-#~ msgstr "Ν"
-
-#~ msgid "N"
-#~ msgstr "Β"
-
-#~ msgid "W"
-#~ msgstr "Δ"
-
-#~ msgid "E"
-#~ msgstr "Α"
-
-#~ msgid "false"
-#~ msgstr "ψευδές"
-
-#~ msgid "true"
-#~ msgstr "αληθές"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Αφαίρεση \"{0}\" για {1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Αφαίρεση \"{0}\" για {1} \"{2}\""
-
-#~ msgid "Change"
-#~ msgstr "Αλλαγή"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
-#~ "μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν "
-#~ "βλέπετε) μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε "
-#~ "διαγραφή;"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Σφάλματα στο άθροισμα ελέγχου: "
-
-#~ msgid "History of Element"
-#~ msgstr "Ιστορικό του Στοιχείου"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Play next marker."
-#~ msgstr "Αναπαραγωγή επόμενου σημαδιού"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Ομάδα προεπιλογών \"{0}\""
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "ένα ίχνος με {0} σημείο"
-#~ msgstr[1] "ένα ίχνος με {0} σημεία"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "το {0} αποτελείται από {1} ίχνος"
-#~ msgstr[1] "το {0} αποτελείται από {1} ίχνη"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} μέσα στο ίχνος"
-
-#~ msgid "Base Server URL"
-#~ msgstr "Η βασική URL για τον διακομιστή"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Πηγή προεπιλογών ετικετών"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonymous"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Πηγές προεπιλογών ετικετών"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Επίπεδα: {0}"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Συγγραφείς: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Σωρός Εντολών: {0}"
-
-#~ msgid "osmarender options"
-#~ msgstr "επιλογές osmarender"
-
-#~ msgid "requested: {0}"
-#~ msgstr "ζητήθηκαν: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "Σφάλμα κατά την αίτηση ενημέρωσης"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Εισάγετε ένα όνομα μενού και ένα WMS URL"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Τροποποίηση της λίστας διακομιστών WMS που εμφανίζεται στο μενού του "
-#~ "πρόσθετου WMS"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (Προκαθορισμένο)"
-
-#~ msgid "Copy Default"
-#~ msgstr "Αντιγραφή Προξαθορισμένου"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Εμφάνιση γεοσημασμένων φωττογραφιών"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Βρίσκομαι στην ζώνη ώρας: "
-
-#~ msgid "Update position for: "
-#~ msgstr "Ενημέρωση θέσης για: "
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Μπορώ να βγάλω φωτογραφία τον δέκτη GPS μου.<br>Μπορεί αυτό να "
-#~ "βοηθήσει;</html>"
-
-#~ msgid "zoom"
-#~ msgstr "ζουμ"
-
-#~ msgid "near"
-#~ msgstr "κοντά"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Εισαγωγή ακολουθίας προς αναζήτηση"
-
-#~ msgid "load data from API"
-#~ msgstr "φόρτωση δεδομένων από το API"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Επιτρεπώμενες ενέργειες"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Περιστροφή πλέγματος"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Επίπεδο πλέγματος:"
-
-#~ msgid "Grid layout"
-#~ msgstr "Διάταξη πλέγματος"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Διόρθωση των επιλεγμένων σφαλμάτων."
-
-#~ msgid "World"
-#~ msgstr "Κόσμος"
-
-#~ msgid "Grid"
-#~ msgstr "Πλέγμα"
-
-#~ msgid "Open User Page"
-#~ msgstr "Άνοιγμα σελίδας χρήστη"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Αντικαθιστά την επιλογή με τα στοιχεία χρήστη"
-
-#~ msgid "Please select some data"
-#~ msgstr "Παρακαλώ επιλέξτε κάποια δεδομένα"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Επιλογή δεδομένων χρήστη"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Aδύνατη η σύνδεση με τον OSM server.Παρακαλω ελέγξτε την σύνδεση σας στο "
-#~ "Internet."
-
-#~ msgid "Boat"
-#~ msgstr "Καράβι"
-
-#~ msgid "Station"
-#~ msgstr "Σταθμός"
-
-#~ msgid "Accomodation"
-#~ msgstr "Διαμονή"
-
-#~ msgid "hikingmap"
-#~ msgstr "χάρτης πεζοπορίας"
-
-#~ msgid "citymap"
-#~ msgstr "χάρτης πόλης"
-
-#~ msgid "map"
-#~ msgstr "χάρτης"
-
-#~ msgid "bicyclemap"
-#~ msgstr "χάρτης ποδηλατοδρομίας"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "football"
-#~ msgstr "ποδόσφαιρο"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Μηχανοκίνητα Αθλήματα"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Επεξεργασία Rugby"
-
-#~ msgid "Charge"
-#~ msgstr "Χρέωση"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "ΣΗΜΑΝΤΙΚΟ : τα δεδομένα βρίσκοντε πολύ μακριά από\n"
-#~ "τα τρέχοντα όρια της ζώνης Lambert.\n"
-#~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα.\n"
-#~ "Αναιρέστε την τελυταία σας ενέργεια. Αποθηκεύστε την εργασία σας\n"
-#~ "και ξεκινήστε νέο επίπεδο στην νέα ζώνη."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Ρύθμιση {0}={1} για {2} \"{3}\""
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Ρύθμιση {0}={1} για {2} {3}"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Ο διακομιστής επέστρεψε εσωτερικό σφάλμα. Δοκιμάστε μια μικρότερη περιοχή "
-#~ "ή ξαναδοκιμάστε αργότερα."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή"
-
-#~ msgid "timezone difference: "
-#~ msgstr "διαφορά στη ζώνη ώρας: "
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Οδός \"από\" δεν βρέθηκε."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "ΒγάλεΜέλοςΣχέσης"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Όλοι οι δρόμοι ήταν άδειοι"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Άνοιξε τις προτιμήσεις για μια σελίδα για παγκόσμιες ρυθμίσεις."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Εμφάνιση πληροφοριών ιστορικού για δρόμους ή κόμβους του OSM."
-
-#~ msgid "Download List"
-#~ msgstr "Λήψη λίστας"
-
-#~ msgid "Edit Station"
-#~ msgstr "Επεξεργασία Σταθμού"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Αδυναμία ανάγνωσης προβολής από τις προτιμήσεις. Θα χρησιμοποιηθεί "
-#~ "EPSG:4326"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Αποθήκευση και Έξοδος"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Επίλυση διενέξεων"
-
-#~ msgid "gps track description"
-#~ msgstr "περιγραφή ίχνους gps"
-
-#~ msgid "Update Data"
-#~ msgstr "Ενημέρωση Δεδομένων"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Επιβεβαίωση συνδυασμού"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Επιβεβαίωση συγχώνευσης"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Ενημερώνει το τρέχον επίπεδο δεδομένων από τον διακομιστή (επαναλαμβάνει "
-#~ "την λήψη δεδομένων)"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Αυτή η ενέργεια θα απαιτήσει {0} επιμέρους αιτήσης λήψης. Θέλετε να "
-#~ "συνεχίσετε;"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Σφάλματα κατά την λήψη"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' οπουδήποτε στο όνομα."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - χωρίς 'Bak' στο όνομα."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Επικοινωνήστε με {0}"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Αδυναμία ανάγνωσης από το URL: \"{0}\""
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Αδυναμία ανοίγματος φακέλου προτιμήσεων: {0}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Επίλυση {0} διενέξεων σε {1} αντικείμενα"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Αντικρουόμενη σχέση"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Άγνωστος ρόλος \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Αδυναμία εγγραφής σελιδοδείκτη."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Αδυναμία ανάγνωσης σελιδοδεικτών."
-
-#~ msgid "resolved version:"
-#~ msgstr "επιλυμένη έκδοση:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} αντικείμενο έχει διενέξεις:"
-#~ msgstr[1] "{0} αντικείμενα έχουν διενέξεις:"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Επίλυση Διενέξεων"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Διενέξεις: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Συγχώνευση διενέξεων."
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Επίλυση Διένεξης"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση"
-
-#~ msgid "Move Down"
-#~ msgstr "Μετακίνηση Κάτω"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Αφαίρεση Επιλεγμένων"
-
-#~ msgid "Move Up"
-#~ msgstr "Μετακίνηση Πάνω"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Διαγραφή Επιπέδου"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Επεξεργαστής Σχέσεων: {0}"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} απομένουν. Αποστολή {4}: {5} (id: {6})"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Διαγραφή και Λήψη"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Λήψη Πρόσθετων"
-
-#~ msgid "Public"
-#~ msgstr "Δημόσιο"
-
-#~ msgid "No password provided."
-#~ msgstr "Δεν δώθηκε συνθηματικό."
-
-#~ msgid "No username provided."
-#~ msgstr "Δεν δώθηκε όνομα χρήστη."
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Εικόνες χωρίς θέση exif"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Διαφορά ώρας {0} ημερών)"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Απόκλειση ανάμεσα σε ίχνος και φωτογραφίες: {0}λ {1}δ"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Άκυρη προβολή"
-
-#~ msgid "Zone"
-#~ msgstr "Ζώνη"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Χειροκίνητη ρύθμιση ζώνης Lambert (π.χ. για τοποθεσίες μεταξύ δύο ζωνών)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Ζώνη Lambert"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Προσθήκη νέου επιπέδου"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Άνοιγμα του παραθύρου OpenStreetBugs και ενεργοποίηση αυτόματης λήψης"
-
-#~ msgid "autozoom"
-#~ msgstr "αυτόματο ζουμ"
-
-#~ msgid "autoload tiles"
-#~ msgstr "αυτόματη φόρτωση πλακιδίων"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Ρυθμίσεις για το πρόσθετο SlippyMap."
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Αυτόματο ζουμ: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Αυτόματη φόρτωση Πλακιδίων: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Μέγιστο επίπεδο ζούμ: "
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS"
-
-#~ msgid "start"
-#~ msgstr "αρχή"
-
-#~ msgid "end"
-#~ msgstr "τέλος"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Εμφάνιση πίνακα Συγγραφέα"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Παρακαλώ αναφέρετε ένα δελτίο στο {0}"
-
-#~ msgid "intermedia"
-#~ msgstr "μεσαία"
-
-#~ msgid "Football"
-#~ msgstr "Ποδόσφαιρο"
-
-#~ msgid "advance"
-#~ msgstr "προχωρημένη"
-
-#~ msgid "Map Type"
-#~ msgstr "Τύπος Χάρτη"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Επεξεργασία Γραφείου Πληροφοριών"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Επεξεργασία Αεροδρομίου"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Επεξεργασία απαιτητικής ορειβασίας"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Επεξεργασία Πεζοπορίας"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Ορειβασία"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Απαιτητική Ορειβασία"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Επεξεργασία Ορειβασίας"
-
-#~ msgid "Help / About"
-#~ msgstr "Βοήθεια / Σχετικά"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
-#~ "A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
-#~ "A> ή <A HREF=\"{1}\">στη γλώσσα σας</A>."
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Η προβολή δεν μπόρεσε να διαβαστεί από τις προτιμήσεις. Χρήση Mercator"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Δεν βρέθηκαν δεδομένα για ενημέρωση. Έχετε ήδη ανοίξει ή λάβει ένα "
-#~ "επίπεδο δεδομένων;"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Αντιγραφή {0} κόμβων σε {1} κόμβους"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Παρακαλώ επιλέξτε ακριβώς 3 κόμβους ή ένας δρόμος με ακριβώς 3 κόμβους."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον "
-#~ "τέσσερις κόμβους."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Η προβολή δεν μπόρεσε να διαβαστεί από τις προτιμήσεις. Χρήση Mercator"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Βοήθεια: Μερικές αλλαγές προήλθαν από την αποστολή νέων δεδομένων στον "
-#~ "διακομιστή."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Ο τρέχων αριθμός αλλαγών υπερβαίνει το μέγιστο αριθμό αλλαγών, τρέχων "
-#~ "είναι {0}, μέγιστος είναι {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Αποτυχία αρχικοποίησης API. Παρακαλώ προσπαθήστε αργότερα."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Αποτυχία αρχικοποίησης API"
-
-#~ msgid "Update Selection"
-#~ msgstr "Ενημέρωση Επιλογής"
-
-#~ msgid "Update failed"
-#~ msgstr "Αποτυχία ενημέρωσης"
-
-#~ msgid "Uploading"
-#~ msgstr "Γίνεται αποστολή"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Συγχρονισμός μόνο {0} {1}"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Προειδοποίηση: η επικεφαλίδα σφάλματος \"{0}\" δεν συμπίπτει με τo "
-#~ "αναμενόμενο πρότυπο \"{1}\""
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Η αποστολή στο OSM API απέτυχε"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "Αφαίρεση αναφοράς από την σχέση {0}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό."
-
-#~ msgid "Full Screen"
-#~ msgstr "Πλήρης Οθόνη"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "το αντικείμενο {0} δεν βρέθηκε στην λίστα"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Ξεπάγωμα της λίστας συγχωνευμένων στοιχείων και έναρξη συγχώνευσης"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Πάγωμα της τρέχουσας λίστας συγχωνευμένων στοιχείων"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr ""
-#~ "Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα κάτω κατά μία θέση"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Όχι, ακύρωση της λειτουργίας"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Η επικοινωνία με τον διακομιστή απέτυχε"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "μη ορατό (στον διακομιστή)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "ορατό (στον διακομιστή)"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Εφαρμογή μερικών επιλύσεων"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:<br>{0}"
-#~ "</html>"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Ιστορικό για {0} {1}"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "Όνομα χρήστη OSM (e-mail)"
-
-#~ msgid "Login"
-#~ msgstr "Είσοδος"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Άγνωστη έκδοση: {0}"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} πρόσθετο φορτώθηκε με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
-#~ msgstr[1] ""
-#~ "{0} πρόσθετα φορτώθηκαν με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
-
-#~ msgid "More details"
-#~ msgstr "Περισσότερες λεπτομέρειες"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Άνοιγμα εικόνων  με το AgPifoJ..."
-
-#~ msgid "Add grid"
-#~ msgstr "Προσθήκη πλέγματος"
-
-#~ msgid "change the selection"
-#~ msgstr "αλλαγή της επιλογής"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Ρυθμίσεις για το πρόσθετο Απομακρυσμένου Ελέγχου."
-
-#~ msgid "image loading..."
-#~ msgstr "φόρτωση εικόνας..."
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "<multiple>"
-#~ msgstr "<πολλαπλές>"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Συνέχεια έτσι κι αλλιώς"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Συγνώμη, δεν δουλεύει για ανόνυμους χρήστες"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Άνοιγμα Σελίδας Χρήστη στον φυλλομετρητή"
-
-#~ msgid "Optional"
-#~ msgstr "Προαιρετικό"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Δεδομένα με σφάλματα. Αποστολή;"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Μέγιστο Μήκος (μέτρα)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Μέγιστο Πλάτος (μέτρα)"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Μέγιστο Ύψος (μέτρα)"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
-
-#~ msgid "% of lat:"
-#~ msgstr "% γεωγ. πλάτους:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% γεωγ. μήκους:"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS"
-
-#~ msgid "Fix relations"
-#~ msgstr "Δίορθωση σχέσεων"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
-#~ "A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Η σελίδα βοήθειας λείπει. Δημιουργήστε την στα <A HREF=\"{0}\">αγγλικά</"
-#~ "A> ή <A HREF=\"{1}\">στη γλώσσα σας</A>."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό."
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Αδυναμία ανάγνωσης \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Aδύνατη η σύνδεση με τον OSM server.Παρακαλω ελέγξτε την σύνδεση σας στο "
-#~ "Internet."
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Διενέξεις κατά την λήψη"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Update selections"
-#~ msgstr "Ενημέρωση επιλογών"
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Αποστολή όλων των αλλαγών από το τρέχον επίπεδο στον διακομιστή OSM"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Αποστολή <strong>απέτυχε</strong>.<br>{0}</html>"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Παρακαλώ εισάγεται ενα γεωγραφικό πλάτος στην κλίμακα -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr ""
-#~ "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό μήκος στην κλίμακα -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr ""
-#~ "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό πλάτος στην κλίμακα -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Παρακαλώ εισάγεται ενα γεωγραφικό μήκος στην κλίμακα -180..180"
-
-#~ msgid "Download Object"
-#~ msgstr "Λήψη Αντικειμένου"
-
-#~ msgid "Download Object..."
-#~ msgstr "Λήψη Αντικειμένου..."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Εναλλαγή προβολής πλήρους οθόνης"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Προβολή Πλήρους Οθόνης"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "Η \"{0}\" δεν είναι κλειστή και γι'αυτό δεν μπορεί να ενωθεί."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Μόνο μέχρι δυο περιοχές μπορούν να ενωθούν μέχρι στιγμής."
-
-#~ msgid "Create a new map."
-#~ msgstr "Δημιουργία καινούργιου χάρτη"
-
-#~ msgid "white"
-#~ msgstr "λευκό"
-
-#~ msgid "gray"
-#~ msgstr "γκρι"
-
-#~ msgid "blue"
-#~ msgstr "μπλε"
-
-#~ msgid "red"
-#~ msgstr "κόκκινο"
-
-#~ msgid "brown"
-#~ msgstr "καφέ"
-
-#~ msgid "black"
-#~ msgstr "μαύρο"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Βρέθηκαν περισότερες απο μία διαδρομή \"προς\""
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Βρέθηκαν περισότερες απο μία διαδρομή \"από\""
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Δεν βρέθηκε \"μέσω' κόμβος ή διαδρομή."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Βρέθηκαν περισότερα απο ένα \"μέσω\""
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Δεν βρέθηκε \"προς\" διαδρομή."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Η διαδρομή \"από\" δεν αρχίζει ούτε τελιώνει στη διαδρομή \"μέσω\""
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Η διαδρομή \"προς\" δεν αρχίζει ούτε τελιώνει στη διαδρομή \"μέσω\""
-
-#~ msgid "Travel"
-#~ msgstr "Ταξίδι"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Η διαδρομή \"από\" δεν αρχίζει ούτε τελειώνει στον κόμβο \"μέσω\""
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Η διαδρομή \"προς\" δεν αρχίζει ούτε τελειώνει στον κόμβο \"μέσω\""
-
-#~ msgid "Waterway Point"
-#~ msgstr "Σημείο Υδατοδιαδρομής"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Κόμβοι ασύνδετοι και χωρίς ετικέτες"
+#~ "Αντικατάσταση του αρχικού λευκού φόντου με το χρώμα φόντου που ορίζεται "
+#~ "στις προτιμήσεις του JOSM."
+
+#~ msgid "unusual tag combination"
+#~ msgstr "ασυνήθηστος συνδυασμός ετικετών"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Διατήρηση των συντεταγμένων τους"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Διατήρηση των συντεταγμένων μου"
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 26529)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:31+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:35+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:36+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Warning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" does not accept file names or file URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -135,13 +136,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -161,7 +162,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -171,6 +172,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,5 +202,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -383,6 +384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -409,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -415,7 +416,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -423,5 +425,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -632,5 +634,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -882,5 +884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -889,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1068,6 +1070,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1218,5 +1220,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1434,6 +1436,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2091,5 +2093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2406,7 +2408,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Download data"
@@ -2661,7 +2663,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2788,10 +2789,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2954,5 +2955,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3538,5 +3539,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3587,40 +3588,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Remove \"{0}\" for node ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Remove \"{0}\" for way ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Remove \"{0}\" for relation ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Set {0}={1} for node ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Set {0}={1} for way ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Set {0}={1} for relation ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Remove \"{0}\" for {1} objects"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3744,4 +3745,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Delete confirmation"
@@ -4055,9 +4057,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Warning: Failed to initialise preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4093,7 +4093,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4199,10 +4198,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de. This is not a critical "
-"error, it should be safe to continue in your work."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4305,5 +4301,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4322,8 +4318,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4465,52 +4461,64 @@
 msgstr "WGS84 Geographic"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
-"NTF<->RGF93 grid"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} to {2} degrees)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4535,80 +4543,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "North"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4830,45 +4858,45 @@
 msgstr "This test checks if multipolygons are valid"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "No outer way for multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygon is not closed"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Intersection between multipolygon ways"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "No useful role for multipolygon member"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5141,5 +5169,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5164,5 +5192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5173,5 +5201,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5579,5 +5607,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5645,5 +5673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "highway"
@@ -5651,5 +5679,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5657,10 +5685,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "waterway"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "landuse"
@@ -5670,5 +5698,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5682,5 +5710,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5693,5 +5721,5 @@
 msgstr "public transport"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6055,5 +6083,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6164,4 +6192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6267,5 +6296,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6310,11 +6339,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6602,9 +6627,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6847,10 +6870,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Keep my coordiates"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Keep their coordiates"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6906,6 +6929,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6927,6 +6950,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7331,5 +7354,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7572,5 +7595,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7784,7 +7807,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "unknown"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8048,5 +8101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8066,5 +8119,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8081,5 +8134,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -8087,5 +8140,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -8128,5 +8181,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8134,5 +8187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8328,5 +8381,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8429,5 +8482,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "User"
@@ -9425,5 +9477,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9605,5 +9657,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9754,4 +9806,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Only changesets owned by myself"
@@ -9764,4 +9817,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Only changesets owned by the user with the following user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10046,9 +10105,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10057,13 +10116,13 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10076,18 +10135,19 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Change values?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10096,5 +10156,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10104,5 +10164,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10111,27 +10171,31 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10140,62 +10204,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10259,9 +10323,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10283,5 +10349,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10623,9 +10689,4 @@
 msgstr "There were {0} conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10666,11 +10727,4 @@
 msgid "Load relation"
 msgstr "Load relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10950,37 +11004,4 @@
 msgstr "Type"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "unknown"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11104,20 +11125,20 @@
 msgstr "Coordinates"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "History for node {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "History for way {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "History for relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Reload the history from the server"
@@ -11211,6 +11232,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Changeset"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11802,14 +11823,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
 msgstr[1] ""
-"<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12238,4 +12255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12266,13 +12284,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12348,38 +12357,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Customise Colour"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Default"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12390,9 +12399,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12400,26 +12409,26 @@
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Timespan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Length"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12428,8 +12437,8 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12438,12 +12447,12 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12452,10 +12461,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12465,78 +12474,78 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12547,11 +12556,11 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12561,6 +12570,6 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12570,27 +12579,27 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12603,29 +12612,29 @@
 "them with audio data.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import not possible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12732,5 +12741,5 @@
 msgstr "Following problems found:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12740,57 +12749,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Show Tile Info"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Snap to tile size"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13334,10 +13351,10 @@
 msgstr "JPEG images (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13345,5 +13362,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13352,21 +13369,21 @@
 msgstr[1] "{0} consists of {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "No existing audio markers in this layer to offset from."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Toggle visible state of the marker text and icons."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synchronise Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13374,5 +13391,5 @@
 "You need to pause audio at the moment when you hear your synchronisation cue."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13380,14 +13397,14 @@
 msgstr "Audio synchronised at point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Unable to synchronise in layer being played."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13417,13 +13434,13 @@
 msgstr "Unable to create new audio marker."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "There was an error while trying to display the URL for this marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL was: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Error displaying URL"
@@ -14441,82 +14458,82 @@
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14524,15 +14541,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "None"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14543,47 +14596,39 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "None"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -14591,5 +14636,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14613,5 +14658,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14654,5 +14699,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14666,38 +14711,18 @@
 msgstr "Foot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14708,10 +14733,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14721,10 +14746,10 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14732,10 +14757,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14743,10 +14768,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14754,5 +14779,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14762,14 +14787,14 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14779,13 +14804,13 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14795,27 +14820,45 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15509,5 +15552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15599,5 +15642,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reset"
@@ -15878,6 +15921,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Always update withouth asking"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16290,5 +16333,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16317,9 +16360,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16619,9 +16662,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16949,6 +16990,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr "Prolog of OsmChange document not written yet. Please write first."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17173,9 +17214,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17577,4 +17616,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Save user and password (unencrypted)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18482,4 +18526,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18615,4 +18661,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19192,5 +19252,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35519,4 +35579,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35533,6 +35594,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35551,15 +35612,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "abbreviated street name"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "oneway tag on a node"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "bridge tag on a node"
@@ -35570,12 +35631,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "wrong highway tag on a node"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Unnamed unclassified highway"
@@ -35584,16 +35645,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "highway without a reference"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "temporary highway type"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "misspelt key name"
@@ -35603,10 +35664,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "cycleway with tag bicycle"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "footway with tag foot"
@@ -35615,10 +35676,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "separate cycleway as lane on a cycleway"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "barrier used on a way"
@@ -35627,35 +35688,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "maxspeed used for footway"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "layer tag with + sign"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "street name contains ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relation without type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurant without name"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "unusual tag combination"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35760,117 +35830,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36119,6 +36199,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Upload cancelled"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36220,9 +36300,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36240,23 +36320,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36264,26 +36374,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Plug-in information"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36291,5 +36429,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36400,9 +36538,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36501,17 +36639,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -37151,31 +37306,35 @@
 msgstr "Select commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Plug-in cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Restore grab shortcut F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM is stopped for the change to take effect."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37300,9 +37459,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Replace the original white background by the backgound colour defined in "
+"Replace the original white background by the background color defined in "
 "JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38218,5 +38375,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38226,17 +38383,17 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
@@ -38388,5 +38545,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38394,10 +38551,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38406,5 +38563,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38413,6 +38570,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38421,9 +38578,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38582,71 +38739,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38654,32 +38819,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38714,6 +38873,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38844,30 +39003,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39560,5 +39732,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39575,5 +39747,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40314,17 +40486,17 @@
 msgstr "New picture layer from clipboard"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "New picture layer from file..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Could not find the map object."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40338,36 +40510,32 @@
 msgstr "The clipboard data is not an image"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40989,5 +41157,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41956,4 +42124,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42173,6 +42358,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42419,5 +42604,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42988,5 +43173,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43384,1283 +43569,141 @@
 msgstr ""
 
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "There are unsaved changes. Discard the changes and continue?"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Unsaved Changes"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Hint: Some changes came from uploading new data to the server."
-
 #~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Save and Exit"
-
-#~ msgid "File could not be found."
-#~ msgstr "File could not be found."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 
 #~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
+#~ "Warning: Failed to initialise preferences.Failed to reset preference file "
+#~ "to default: {0}"
 
 #~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Use decimal degrees."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Enter the coordinates for the new node."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negative values denote Western/Southern hemisphere."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 
 #~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de. This is not a "
+#~ "critical error, it should be safe to continue in your work."
 
 #~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 
 #~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Combine ways with different memberships?"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Combine Anyway"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Enter values for all conflicts."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "All the ways were empty"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Solve Conflicts"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Please select at least one task to download"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Download primitives referring to one of the selected primitives"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Download referrers from OSM..."
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Loading parents of primitive {2}"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Download referrers..."
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflicts during download"
-
-#~ msgid "gps track description"
-#~ msgstr "gps track description"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "paramenter ''{0}'' must not be null"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Can only edit help pages from JOSM Online Help"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error while loading page {0}"
-
-#~ msgid "History of Element"
-#~ msgstr "History of Element"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Keep my coordiates"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Keep their coordiates"
+
+#~ msgid "Change values?"
+#~ msgstr "Change values?"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Open in Browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Help"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Please select at least two nodes to merge."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Merge Anyway"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Merge nodes with different memberships?"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "Cannot merge nodes: Would have to delete a way that is still used."
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Merge the currently selected primitives into another layer"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Please enter a valid latitude in the range -90..90"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Please enter a latitude in the range -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Please enter a valid longitude in the range -180..180"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Please enter a longitude in the range -180..180"
-
-#~ msgid "Download Object..."
-#~ msgstr "Download Object..."
-
-#~ msgid "Download Object"
-#~ msgstr "Download Object"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Fullscreen View"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Toggle Fullscreen view"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Only up to two areas can be joined at the moment."
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" is not closed and therefore cannot be joined."
-
-#~ msgid "Fix relations"
-#~ msgstr "Fix relations"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Joined self-overlapping area"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Join Areas: Remove Short Ways"
-
-#~ msgid "Closed Way"
-#~ msgstr "Closed Way"
-
-#~ msgid "Create a new map."
-#~ msgstr "Create a new map."
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
+
+#~ msgid "Changeset"
+#~ msgstr "Changeset"
 
 #~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgstr[1] ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+
+#~ msgid ""
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "to {0} primitive"
-#~ msgstr[1] "to {0} primtives"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Always update withouth asking"
 
 #~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Deleted or moved primitives"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Errors during Download"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr "Prolog of OsmChange document not written yet. Please write first."
 
 #~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Select, move and rotate objects"
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Upload cancelled"
 
 #~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Please enter a filter string."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Please enter a search string."
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ "Plug-in cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 
 #~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Purged object ''{0}''"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Removing reference from relation {0}"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Undelete {0} primitive"
-#~ msgstr[1] "Undelete {0} primitives"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Error: Unexpected line ''{0}'' in bookmark list from server"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Degrees Minutes Seconds"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Missing merge target for object with id {0}"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Area style way is not closed."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "More than one \"from\" way found."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "More than one \"to\" way found."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "More than one \"via\" found."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Unknown role ''{0}''."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Unknown member type for ''{0}''."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "No \"from\" way found."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "No \"to\" way found."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "No \"via\" node or way found."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "The \"from\" way does not start or end at a \"via\" node."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "The \"to\" way does not start or end at a \"via\" node."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "The \"from\" way does not start or end at the \"via\" way."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "The \"to\" way does not start or end at the \"via\" way."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Style for restriction {0} not found."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Style for inner way ''{0}'' equals multipolygon."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Style for outer way ''{0}'' mismatches."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Error: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warning: {0}"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (France)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 North Geodesic system"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Could not write bookmark.<br>{0}</html>"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Merging deleted primitives failed"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Communication with server failed"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Yes, undelete them too"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, cancel operation"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ ">There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgstr[1] ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Undelete additional nodes?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgstr[1] ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete them too?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Undelete dependent primitives?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Visible State:"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (on the server)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "not visible (on the server)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Keep a clone of the local version"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Physically delete from local dataset"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Keep my visible state"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Yes, reset the id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reset id to 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Keep their visible state"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Yes, purge it"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Remove from dataset"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Undecide conflict between visible state"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Command Stack: {0}"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Apply also for children"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Select primitives submitted by this user"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Download and show the history of the selected primitives"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Zoom to the corresponding primitives in the current data layer"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Multiple members referring to same primitive"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset before the first member"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset after the last member"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "Remove all members referring to one of the selected primitives"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Select relation members which refer to primitives in the current selection"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Select primitives for selected relation members"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "You are setting an empty role on {0} primitive."
-#~ msgstr[1] "You are setting an empty role on {0} primitives."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "This is equal to deleting the roles of these primitives."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Click do download the currently selected area"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Enter an upload comment (min. 3 characters)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Please enter a comment for this upload changeset (min. 3 characters)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Illegal upload comment"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Preparing primitives to upload ..."
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Uploading {0} objects ..."
-
-#~ msgid "Length: "
-#~ msgstr "Length: "
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgstr[1] ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialogue and manually resolve it."
-#~ msgstr[1] ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialogue and manually resolve them."
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "track"
-#~ msgstr[1] "tracks"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "point"
-#~ msgstr[1] "points"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "a track with {0} point"
-#~ msgstr[1] "a track with {0} points"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} consists of {1} track"
-#~ msgstr[1] "{0} consists of {1} tracks"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} point"
-#~ msgstr[1] "{0} points"
-
-#~ msgid "GPS point"
-#~ msgstr "GPS point"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Show/Hide Text/Icons"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-
-#~ msgid ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-#~ msgstr ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Create non-audio markers when reading GPX."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Only interesting direction hints (e.g. with oneway tag)."
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Enable built-in defaults"
-
-#~ msgid "Used style"
-#~ msgstr "Used style"
-
-#~ msgid "Active styles"
-#~ msgstr "Active styles"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Available styles (from {0})"
-
-#~ msgid "Icon paths"
-#~ msgstr "Icon paths"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Add a filename or an URL of an active style"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Keep backup files"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Warning: no preference ''{0}'' found."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Malformed sentences: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Checksum errors: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Unknown sentences: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Zero coordinates: "
-
-#~ msgid "loading plugin ''{0}'' ({1})"
-#~ msgstr "loading plug-in ''{0}'' ({1})"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Could not load plug-in {0} because the plug-in<br>main class "
-#~ "''{1}'' was not found.<br>Delete from preferences?"
-
-#~ msgid ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-#~ msgstr ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-
-#~ msgid "No username provided."
-#~ msgstr "No username provided."
-
-#~ msgid "No password provided."
-#~ msgstr "No password provided."
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Point on angle of building to start drawing"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Point on opposite end of building"
-
-#~ msgid "Set width of building"
-#~ msgstr "Set width of building"
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Extract building footprints"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Add a new layer"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Download WMS tile from {0}"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Duplicate Way"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Duplicate selected ways."
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Can't duplicate unordered way."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Create duplicate way"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Grid origin location"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Grid rotation"
-
-#~ msgid "World"
-#~ msgstr "World"
-
-#~ msgid "Grid layout"
-#~ msgstr "Grid layout"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Grid layer:"
-
-#~ msgid "Add grid"
-#~ msgstr "Add grid"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Direction index '{0}' not found"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Multipolygon must consist only of closed ways."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "You must select at least two ways."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Couldn't create new bug. Result: {0}"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Loads calibration data to a file"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Image not created properly."
-
-#~ msgid "load data from API"
-#~ msgstr "load data from API"
-
-#~ msgid "create new objects"
-#~ msgstr "create new objects"
-
-#~ msgid "change the selection"
-#~ msgstr "change the selection"
-
-#~ msgid "change the viewport"
-#~ msgstr "change the viewport"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "confirm all Remote Control actions manually"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "A plug-in that allows JOSM to be controlled from other applications."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Settings for the Remote Control plug-in."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "The Remote Control plug-in will always listen on port 8111 on localhost."
-#~ "The port is not variable because it is referenced by external "
-#~ "applications talking to the plug-in."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Permitted actions"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "image "
-#~ msgstr "image "
-
-#~ msgid "autozoom"
-#~ msgstr "autozoom"
-
-#~ msgid "autoload tiles"
-#~ msgstr "autoload tiles"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Settings for the SlippyMap plug-in."
-
-#~ msgid "Tile Sources"
-#~ msgstr "Tile Sources"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Auto zoom: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Autoload Tiles: "
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Min zoom lvl: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max zoom lvl: "
-
-#~ msgid "Fade background: "
-#~ msgstr "Fade background: "
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Duplicate hotkey for button '{0}' - button will be ignored!"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Select a single, closed way of at least four nodes."
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Data with errors. Upload anyway?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Fix the selected errors."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignore the selected errors next time."
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Multipolygon inner way is outside."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Non-Way in multipolygon."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Illegal tag/value combinations"
-
-#~ msgid "Painting problem"
-#~ msgstr "Painting problem"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Check for paint notes."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Check if map painting found data errors."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Untagged and unconnected nodes"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Exception occurred"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Adjust the position of the selected WMS layer"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Please select the WMS layer to adjust."
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Select WMS layer"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "There are currently no WMS layer to adjust."
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS Plug-in Preferences"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Modify list of WMS servers displayed in the WMS plug-in menu"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (Default)"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Enter a menu name and WMS URL"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copy Selected Default(s)"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Allows the user to create different colour schemes and to switch between "
-#~ "them. Just change the colours and create a new scheme. Used to switch to "
-#~ "a white background with matching colours for better visibility in bright "
-#~ "sunlight. See dialogue in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplicate Ways with an offset"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Provide a background layer that displays a map grid"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Another plug-in to match images to the waypoints in a GPX file. A match "
-#~ "is made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag "
-#~ "matches the filename of an image."
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Displays an OpenLayers background image"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Let other applications send commands to JOSM."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-
-#~ msgid "Goods"
-#~ msgstr "Goods"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Max. Height (metres)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Max. Width (metres)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Max. Length (metres)"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "mountain_hiking"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "demanding_mountain_hiking"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "alpine_hiking"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "demanding_alpine_hiking"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "difficult_alpine_hiking"
-
-#~ msgid "Bikes"
-#~ msgstr "Bikes"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Waterway Point"
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "Indipend."
-#~ msgstr "Indipend."
-
-#~ msgid "Travel"
-#~ msgstr "Travel"
-
-#~ msgid "Accomodation"
-#~ msgstr "Accomodation"
-
-#~ msgid "football"
-#~ msgstr "football"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motor Sports"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Edit Motor Sports"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
-#~ msgid "Edit Football"
-#~ msgstr "Edit American Football"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Edit Rugby"
-
-#~ msgid "Man-Made"
-#~ msgstr "Man-Made"
-
-#~ msgid "any substance"
-#~ msgstr "any substance"
-
-#~ msgid "underwater"
-#~ msgstr "underwater"
-
-#~ msgid "overground"
-#~ msgstr "overground"
-
-#~ msgid "tower"
-#~ msgstr "tower"
-
-#~ msgid "line"
-#~ msgstr "line"
-
-#~ msgid "minor_line"
-#~ msgstr "minor_line"
-
-#~ msgid "Amenities"
-#~ msgstr "Amenities"
-
-#~ msgid "black"
-#~ msgstr "black"
-
-#~ msgid "brown"
-#~ msgstr "brown"
-
-#~ msgid "red"
-#~ msgstr "red"
-
-#~ msgid "blue"
-#~ msgstr "blue"
-
-#~ msgid "gray"
-#~ msgstr "gray"
-
-#~ msgid "white"
-#~ msgstr "white"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
+#~ "Replace the original white background by the backgound colour defined in "
+#~ "JOSM preferences."
+
+#~ msgid "unusual tag combination"
+#~ msgstr "unusual tag combination"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 26529)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 26530)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -20,10 +20,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:41+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:39+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -38,12 +38,12 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -98,6 +98,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -121,14 +122,14 @@
 msgstr "Warning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" does not accept file names or file URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -386,6 +387,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -412,5 +413,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -418,7 +419,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -426,5 +428,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -635,5 +637,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -885,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -892,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1071,6 +1073,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1221,5 +1223,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1437,6 +1439,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2094,5 +2096,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2409,7 +2411,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Download data"
@@ -2664,7 +2666,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2791,10 +2792,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2957,5 +2958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3541,5 +3542,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3590,40 +3591,40 @@
 msgstr "Changed nodes of {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Remove \"{0}\" for node ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Remove \"{0}\" for way ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Remove \"{0}\" for relation ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Set {0}={1} for node ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Set {0}={1} for way ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Set {0}={1} for relation ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Remove \"{0}\" for {1} objects"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3747,4 +3748,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Delete confirmation"
@@ -4058,9 +4060,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Warning: Failed to initialise preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4096,7 +4096,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4202,10 +4201,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de. This is not a critical "
-"error, it should be safe to continue in your work."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4308,5 +4304,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4325,8 +4321,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4468,52 +4464,64 @@
 msgstr "WGS84 Geographic"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
-"NTF<->RGF93 grid"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} to {2} degrees)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4538,80 +4546,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "North"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4833,45 +4861,45 @@
 msgstr "This test checks if multipolygons are valid"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "No outer way for multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygon is not closed"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Intersection between multipolygon ways"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "No useful role for multipolygon member"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5144,5 +5172,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5167,5 +5195,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5176,5 +5204,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5582,5 +5610,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5648,5 +5676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "highway"
@@ -5654,5 +5682,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5660,10 +5688,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "waterway"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "landuse"
@@ -5673,5 +5701,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5685,5 +5713,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5696,5 +5724,5 @@
 msgstr "public transport"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6058,5 +6086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6167,4 +6195,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6270,5 +6299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6313,11 +6342,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6605,9 +6630,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6850,10 +6873,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Keep my coordiates"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Keep their coordiates"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6909,6 +6932,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6930,6 +6953,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7334,5 +7357,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7575,5 +7598,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7787,7 +7810,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "unknown"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8051,5 +8104,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8069,5 +8122,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8084,5 +8137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Download incomplete members of selected relations"
@@ -8090,5 +8143,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Download incomplete members"
@@ -8131,5 +8184,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8137,5 +8190,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8331,5 +8384,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8432,5 +8485,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "User"
@@ -9428,5 +9480,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9608,5 +9660,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9757,4 +9809,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Only changesets owned by myself"
@@ -9767,4 +9820,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Only changesets owned by the user with the following user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10057,9 +10116,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10068,13 +10127,13 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10087,18 +10146,19 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Change values?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Replace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10107,5 +10167,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10115,5 +10175,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10122,27 +10182,31 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10151,62 +10215,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10270,9 +10334,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10294,7 +10360,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Downloading {0} incomplete child of {1} parent relations"
-msgstr[1] "Downloading {0} incomplete children of {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10636,9 +10702,4 @@
 msgstr "There were {0} conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10679,11 +10740,4 @@
 msgid "Load relation"
 msgstr "Load relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10963,37 +11017,4 @@
 msgstr "Type"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "unknown"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11117,20 +11138,20 @@
 msgstr "Coordinates"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "History for node {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "History for way {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "History for relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Reload the history from the server"
@@ -11224,6 +11245,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Changeset"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11815,14 +11836,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
 msgstr[1] ""
-"<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12251,4 +12268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12279,13 +12297,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12361,38 +12370,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Customise Colour"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Default"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12403,9 +12412,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12413,26 +12422,26 @@
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Timespan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Length"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12441,8 +12450,8 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12451,12 +12460,12 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12465,10 +12474,10 @@
 msgstr[1] "{0} tracks, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12478,78 +12487,78 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12560,11 +12569,11 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12574,6 +12583,6 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12583,27 +12592,27 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12616,29 +12625,29 @@
 "them with audio data.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import not possible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12745,5 +12754,5 @@
 msgstr "Following problems found:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12753,57 +12762,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Show Tile Info"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Snap to tile size"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13347,10 +13364,10 @@
 msgstr "JPEG images (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13358,5 +13375,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13365,21 +13382,21 @@
 msgstr[1] "{0} consists of {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "No existing audio markers in this layer to offset from."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Toggle visible state of the marker text and icons."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synchronise Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13387,5 +13404,5 @@
 "You need to pause audio at the moment when you hear your synchronisation cue."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13393,14 +13410,14 @@
 msgstr "Audio synchronised at point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Unable to synchronise in layer being played."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13430,13 +13447,13 @@
 msgstr "Unable to create new audio marker."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "There was an error while trying to display the URL for this marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL was: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Error displaying URL"
@@ -14456,82 +14473,82 @@
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14539,15 +14556,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "None"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14558,47 +14611,39 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "None"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -14606,5 +14651,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14628,5 +14673,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14669,5 +14714,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14681,38 +14726,18 @@
 msgstr "Foot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14723,10 +14748,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14736,10 +14761,10 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14747,10 +14772,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14758,10 +14783,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14769,5 +14794,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14777,14 +14802,14 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14794,13 +14819,13 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14810,27 +14835,45 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15524,5 +15567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15614,5 +15657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reset"
@@ -15893,6 +15936,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Always update withouth asking"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16305,5 +16348,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16332,9 +16375,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16634,9 +16677,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16964,6 +17005,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr "Prolog of OsmChange document not written yet. Please write first."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17188,9 +17229,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17592,4 +17631,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Save user and password (unencrypted)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18505,4 +18549,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18638,4 +18684,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19215,5 +19275,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35542,4 +35602,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35556,6 +35617,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35574,15 +35635,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "abbreviated street name"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "oneway tag on a node"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "bridge tag on a node"
@@ -35593,12 +35654,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "wrong highway tag on a node"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Unnamed unclassified highway"
@@ -35607,16 +35668,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "highway without a reference"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "temporary highway type"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "misspelt key name"
@@ -35626,10 +35687,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "cycleway with tag bicycle"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "footway with tag foot"
@@ -35638,10 +35699,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "separate cycleway as lane on a cycleway"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "barrier used on a way"
@@ -35650,35 +35711,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "maxspeed used for footway"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "layer tag with + sign"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "street name contains ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relation without type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurant without name"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "unusual tag combination"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35783,117 +35853,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36142,6 +36222,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Upload cancelled"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36243,9 +36323,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36263,23 +36343,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36287,26 +36397,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Plug-in information"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36314,5 +36452,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36423,9 +36561,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36524,17 +36662,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -37174,31 +37329,35 @@
 msgstr "Select commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Plug-in cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Restore grab shortcut F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM is stopped for the change to take effect."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37323,9 +37482,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Replace the original white background by the backgound colour defined in "
+"Replace the original white background by the background color defined in "
 "JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38241,5 +38398,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38249,17 +38406,17 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
@@ -38411,5 +38568,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38417,10 +38574,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38429,5 +38586,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38436,6 +38593,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38444,9 +38601,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38605,71 +38762,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38677,32 +38842,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38737,6 +38896,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38867,30 +39026,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39583,5 +39755,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39598,5 +39770,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40337,17 +40509,17 @@
 msgstr "New picture layer from clipboard"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "New picture layer from file..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Could not find the map object."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40361,36 +40533,32 @@
 msgstr "The clipboard data is not an image"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -41012,5 +41180,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41979,4 +42147,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42198,12 +42383,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
-msgstr[0] ""
-"This turn restriction refers to an object which was deleted outside of this "
-"turn restriction editor:"
-msgstr[1] ""
 "This turn restriction refers to {0} objects which were deleted outside of "
 "this turn restriction editor:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -42458,6 +42639,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43027,5 +43208,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43423,4808 +43604,144 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Move"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Open a preferences page for global settings."
-
-#~ msgid "Data Layer"
-#~ msgstr "Data Layer"
-
-#~ msgid "No data imported."
-#~ msgstr "No data imported."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Please enter the desired coordinates first."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Please enter a name for the location."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Select a bookmark first."
-
-#~ msgid "File could not be found."
-#~ msgstr "File could not be found."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Upload all changes to the OSM server."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "There are unresolved conflicts. You have to resolve these first."
-
-#~ msgid "Uploading data"
-#~ msgstr "Uploading data"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Not implemented yet."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "No document open so nothing to save."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Unknown file extension."
-
-#~ msgid "gps track description"
-#~ msgstr "gps track description"
-
-#~ msgid "Load Selection"
-#~ msgstr "Load Selection"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contact {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "Downloading..."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Refresh the selection list."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Please enter a search string."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Merging conflicts."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolve Conflicts"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Delete the selected layer."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "There were conflicts during import."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} deleted.)"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "No time for point {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Cannot read time \"{0}\" from point {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "No images with readable timestamps found."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS start: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS end: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "current delta: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "timezone difference: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} within the track."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sync clock"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "The date in file \"{0}\" could not be parsed."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "There is no EXIF time within the file \"{0}\"."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Time entered could not be parsed."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Could not read bookmarks."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Could not write bookmark."
-
-#~ msgid "layer not in list."
-#~ msgstr "layer not in list."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Hint: Some changes came from uploading new data to the server."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Unsaved Changes"
-
-#~ msgid "my version:"
-#~ msgstr "my version:"
-
-#~ msgid "their version:"
-#~ msgstr "their version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "resolved version:"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contacting the OSM server..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Error while parsing"
+#~ msgid "Change values?"
+#~ msgstr "Change values?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "unusual tag combination"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Upload cancelled"
 
 #~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Base Server URL"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM password"
-
-#~ msgid "Unknown version"
-#~ msgstr "Unknown version"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Illegal object with id=0"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Preparing data..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Incorrect password or username."
-
-#~ msgid "Enter Password"
-#~ msgstr "Enter Password"
-
-#~ msgid "Aborting..."
-#~ msgstr "Aborting..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Error during parse."
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "different"
-
-#~ msgid "true"
-#~ msgstr "true"
-
-#~ msgid "false"
-#~ msgstr "false"
-
-#~ msgid "to"
-#~ msgstr "to"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolve {0} conflicts in {1} objects"
-
-#~ msgid "Change"
-#~ msgstr "Change"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Cannot open preferences directory: {0}"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "point"
-#~ msgstr[1] "points"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "a track with {0} point"
-#~ msgstr[1] "a track with {0} points"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} point"
-#~ msgstr[1] "{0} points"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "image"
-#~ msgstr[1] "images"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} object has conflicts:"
-#~ msgstr[1] "{0} objects have conflicts:"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Can only edit help pages from JOSM Online Help"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Could not rename the file \"{0}\"."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Click Reload to refresh list"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Keep my coordiates"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Keep their coordiates"
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-
-#~ msgid "Images for {0}"
-#~ msgstr "Images for {0}"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} consists of {1} track"
-#~ msgstr[1] "{0} consists of {1} tracks"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin not found: {0}."
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Version {1}{2}"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparing..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Uploading..."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Previous Marker"
-
-#~ msgid "Next Marker"
-#~ msgstr "Next Marker"
-
-#~ msgid "start"
-#~ msgstr "start"
-
-#~ msgid "end"
-#~ msgstr "end"
-
-#~ msgid "All images"
-#~ msgstr "All images"
-
-#~ msgid "help"
-#~ msgstr "help"
-
-#~ msgid "World"
-#~ msgstr "World"
-
-#~ msgid "Grid layout"
-#~ msgstr "Grid layout"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM username (e-mail)"
-
-#~ msgid "Do not show again"
-#~ msgstr "Do not show again"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 
 #~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Warning: Failed to initialise preferences.Failed to reset preference file "
+#~ "to default: {0}"
 
 #~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Found <nd> element in non-way."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Missing required attribute \"{0}\"."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Parse error: invalid document structure for gpx document"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
+
+#~ msgid "Changeset"
+#~ msgstr "Changeset"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> has zero ref"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Opening changeset..."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin requires JOSM update: {0}."
-
-#~ msgid "Commit comment"
-#~ msgstr "Commit comment"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server does not support changesets"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "There are unsaved changes. Discard the changes and continue?"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Data Sources and Types"
-
-#~ msgid "y from"
-#~ msgstr "y from"
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de. This is not a "
+#~ "critical error, it should be safe to continue in your work."
 
 #~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-
-#~ msgid "x from"
-#~ msgstr "x from"
-
-#~ msgid "zoom level"
-#~ msgstr "zoom level"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-
-#~ msgid "Download Area"
-#~ msgstr "Download Area"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "An empty value deletes the key."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Preset group ''{0}''"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tags (empty value deletes tag)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupied By"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Edit new relation"
-
-#~ msgid "Create new relation"
-#~ msgstr "Create new relation"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Edit relation #{0}"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Edit Properties"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Add all currently selected objects as members"
-
-#~ msgid "Add Selected"
-#~ msgstr "Add Selected"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Remove the member in the current table row from this relation"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "There are unsaved changes. Delete the layer anwyay?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Do you really want to delete the whole layer?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Merge the layer directly below into the selected layer."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Error parsing server response."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Cannot connect to server."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Download all incomplete ways and nodes in relation"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Members: {0}"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Show/Hide Text/Icons"
-
-#~ msgid "name"
-#~ msgstr "name"
-
-#~ msgid "Length: "
-#~ msgstr "Length: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Timespan: "
-
-#~ msgid "Read GPX..."
-#~ msgstr "Read GPX..."
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Please report a ticket at {0}"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS unit timezone (difference to photo)"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Be sure to include the following information:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Include your steps to get to the error (as detailed as possible)!"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Keep backup files"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Enable built-in defaults"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagging preset sources"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagging preset source"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Add a new tagging preset source to the list."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "The base URL for the OSM server (REST API)"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Downloaded plugin information from {0} site"
-#~ msgstr[1] "Downloaded plugin information from {0} sites"
-
-#~ msgid "No plugin information found."
-#~ msgstr "No plugin information found."
-
-#~ msgid "Download List"
-#~ msgstr "Download List"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Add either site-josm.xml or Wiki Pages."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Error deleting plugin file: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin already exists"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Error reading plugin information file: {0}"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "All installed plugins are up to date."
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 
 #~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxy server host"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxy Settings"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Download missing plugins"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonymous"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Enable proxy server"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 
 #~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgstr[1] ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+
+#~ msgid ""
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Create non-audio markers when reading GPX."
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxy server port"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Proxy server username"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Proxy server password"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Only interesting direction hints (e.g. with oneway tag)."
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 
 #~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Maximum length (in metres) to draw lines. Set to '-1' to draw all lines."
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 
 #~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr "Prolog of OsmChange document not written yet. Please write first."
 
 #~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Thank you for your understanding</p>"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Always update withouth asking"
 
 #~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
+#~ "Plug-in cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 
 #~ msgid ""
-#~ "<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, '.'/Period 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>"
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ 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>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Activating updated plugins"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-
-#~ msgid "Set the language."
-#~ msgstr "Set the language."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Open file (as raw gps, if .gpx)"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Update Plugins"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Could not download plugin: {0} from {1}"
-
-#~ msgid "File not found"
-#~ msgstr "File not found"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "RemoveRelationMember"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotate"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Remove \"{0}\" for {1} {2}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Remove \"{0}\" for {1} ''{2}''"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Delete {1} {0}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Delete {0} {1}"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects, that you don't see, "
-#~ "might be using them.<br>Do you really want to delete?"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Degrees Minutes Seconds"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Conflicting relation"
-
-#~ msgid "Split way segment"
-#~ msgstr "Split way segment"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert Zone (France)"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error while loading page {0}"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Display history information about OSM ways or nodes."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Open in Browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Help"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Combine ways with different memberships?"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "W"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Enter values for all conflicts."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "All the ways were empty"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-
-#~ msgid "Create a new map."
-#~ msgstr "Create a new map."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Upload these changes?"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Checksum errors: "
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Malformed sentences: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Unknown sentences: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Zero coordinates: "
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Some of the nodes are (almost) in the line"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Missing arguments for or."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Expected closing bracket."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Missing argument for not."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "An error occurred while restoring backup file."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "An error occurred while saving."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Could not back up file."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Drag a way segment to make a rectangle."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Select, move and rotate objects"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Please select at least two nodes to merge."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Merge nodes with different memberships?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "Cannot merge nodes: Would have to delete a way that is still used."
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Selection must consist only of ways."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Only two nodes allowed"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Only one node selected"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Please select ways with almost right angles to orthogonalise."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Those nodes are not in a circle."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Use decimal degrees."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Enter the coordinates for the new node."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negative values denote Western/Southern hemisphere."
-
-#~ msgid "Play previous marker."
-#~ msgstr "Play previous marker."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Dupe {0} nodes into {1} nodes"
-
-#~ msgid "Jump back."
-#~ msgstr "Jump back."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Slower Forwards"
-
-#~ msgid "Play next marker."
-#~ msgstr "Play next marker."
-
-#~ msgid "Jump forward"
-#~ msgstr "Jump forwards"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Faster Forwards"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Please select at least one task to download"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Don't apply changes"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Duplicate selected ways."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Duplicate Way"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Create duplicate way"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Couldn't create new bug. Result: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Really mark this issue as ''done''?"
-
-#~ msgid "change the viewport"
-#~ msgstr "change the viewport"
-
-#~ msgid "load data from API"
-#~ msgstr "load data from API"
-
-#~ msgid "change the selection"
-#~ msgstr "change the selection"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "confirm all Remote Control actions manually"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Permitted actions"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Please enter a search string"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Cannot read place search results from server"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Import TCX File..."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Import TCX file as GPS track"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Direction index '{0}' not found"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "near"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Fix the selected errors."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignore the selected errors next time."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validate either current selection or complete dataset."
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "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."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Untagged and unconnected nodes"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Illegal tag/value combinations"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Data with errors. Upload anyway?"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Duplicate hotkey for button '{0}' - button will be ignored!"
-
-#~ msgid "Request Update"
-#~ msgstr "Request Update"
-
-#~ msgid "error loading metadata"
-#~ msgstr "error loading metadata"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Show Tile Status"
-
-#~ msgid "image not loaded"
-#~ msgstr "image not loaded"
-
-#~ msgid "requested: {0}"
-#~ msgstr "requested: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "error requesting update"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Tile Sources"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotagged pictures"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Display geotagged photos"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} were found to be gps tagged."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Open images with AgPifoJ..."
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "I'm in the timezone of: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Open an other photo"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Not yet tagged images"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Images with no exif position"
-
-#~ msgid "Update position for: "
-#~ msgstr "Update position for: "
-
-#~ 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>"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX Track loaded"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender options"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier image id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Please select the row to copy."
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Enter a menu name and WMS URL"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Download WMS tile from {0}"
-
-#~ msgid "Copy Default"
-#~ msgstr "Copy Default"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (Default)"
-
-#~ msgid "Help / About"
-#~ msgstr "Help / About"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Grid origin location"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Grid layer:"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "WMS Plugin Help"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Exception occurred"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Adjust the position of the WMS layer"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Grid rotation"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorboat"
-
-#~ msgid "Goods"
-#~ msgstr "Goods"
-
-#~ msgid "Boat"
-#~ msgstr "Boat"
-
-#~ msgid "Bridleway"
-#~ msgstr "Bridleway"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cycleway"
-
-#~ msgid "Footway"
-#~ msgstr "Footway"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track Grade 3"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track Grade 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track Grade 1"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Edit Hiking"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track Grade 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track Grade 4"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Edit Demanding Mountain Hiking"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Alpine Hiking"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Edit Alpine Hiking"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Mountain Hiking"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Edit Mountain Hiking"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Demanding Mountain Hiking"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Drawbridge"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Waterway Point"
-
-#~ msgid "park_and_ride"
-#~ msgstr "park_and_ride"
-
-#~ msgid "Shop"
-#~ msgstr "Shop"
-
-#~ msgid "Edit Station"
-#~ msgstr "Edit Station"
-
-#~ msgid "citymap"
-#~ msgstr "citymap"
-
-#~ msgid "hikingmap"
-#~ msgstr "hikingmap"
-
-#~ msgid "map"
-#~ msgstr "map"
-
-#~ msgid "bicyclemap"
-#~ msgstr "bicyclemap"
-
-#~ msgid "board"
-#~ msgstr "board"
-
-#~ msgid "Accomodation"
-#~ msgstr "Accomodation"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "football"
-#~ msgstr "football"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motor Sports"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Edit Motor Sports"
-
-#~ msgid "Edit Football"
-#~ msgstr "Edit American Football"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Edit Rugby"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianist"
-
-#~ msgid "Amenities"
-#~ msgstr "Amenities"
-
-#~ msgid "Charge"
-#~ msgstr "Charge"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Amount of Wires"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK+)"
-
-#~ 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] ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
-#~ msgstr[1] ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Ill-formed node id"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, possibly some missing tags."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Found <member> element in non-relation."
-
-#~ msgid ""
-#~ "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 a bug."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Move nodes so all angles are 90 or 270 degree"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Parsing error in URL: \"{0}\""
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Could not read from URL: \"{0}\""
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "None of this way's nodes are glued to anything else."
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Can't duplicate unordered way."
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ 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&layers=global_mosaic&styles=&srs=EPSG:4326&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 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&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
-#~ "format=image/png"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Download Rectified Image from Metacarta's Map Rectifier WMS"
-
-#~ msgid "Portcullis"
-#~ msgstr "Portcullis"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Deleted member ''{0}'' in relation."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Empty member in relation."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "multipolygon way ''{0}'' is not closed."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "No useful role ''{0}'' for Way ''{1}''."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Way ''{0}'' with less than two points."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Style for inner way ''{0}'' equals multipolygon."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Non-Way ''{0}'' in multipolygon."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "No outer way for multipolygon ''{0}''."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Intersection between ways ''{0}'' and ''{1}''."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Inner way ''{0}'' is outside."
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Preferences file had errors. Making backup of old one to {0}."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "One of the selected files was null !!!"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Style for outer way ''{0}'' mismatches."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Error: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warning: {0}"
-
-#~ msgid "Painting problem"
-#~ msgstr "Painting problem"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Check for paint notes."
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Replaces Selection with Users data"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Please choose a user using the author panel"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Sorry, doesn't work with anonymous users"
-
-#~ msgid "Open User Page"
-#~ msgstr "Open User Page"
-
-#~ msgid "Please select some data"
-#~ msgstr "Please select some data"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Open User Page in browser"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Select User's Data"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Show Author Panel"
-
-#~ 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.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Upload to OSM..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Configure Sites..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Check if map painting found data errors."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Authors: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Layers: {0}"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "History of Element"
-#~ msgstr "History of Element"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Command Stack: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflicts: {0}"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Area style way is not closed."
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Opens the OpenStreetBugs window and activates the automatic download"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "The projection could not be read from preferences. Using EPSG:4326"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - not 'Bak' in the name."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' anywhere in the name."
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - object with given number of nodes"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Please select one or more closed ways of at least four nodes."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchronise Time with GPS Unit"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "More than one \"to\" way found."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "More than one \"from\" way found."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Style for restriction {0} not found."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "The \"from\" way doesn't start or end at a \"via\" node."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "No \"from\" way found."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "No \"to\" way found."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Unknown role ''{0}''."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Unknown member type for ''{0}''."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Plugin {0} is required by plugin {1} but was not found."
-
-#~ msgid "intermedia"
-#~ msgstr "intermediate"
-
-#~ msgid "advance"
-#~ msgstr "advanced"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Edit Beverages Shop"
-
-#~ msgid "optician"
-#~ msgstr "optician"
-
-#~ msgid "sports"
-#~ msgstr "sports"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-
-#~ msgid "Public"
-#~ msgstr "Public"
-
-#~ msgid "No username provided."
-#~ msgstr "No username provided."
-
-#~ msgid "No password provided."
-#~ msgstr "No password provided."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Selected makes your trace public in openstreetmap.org"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Open a layer first (GPX, OSM, cache)"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Add a new layer"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert Zone 1 cache file (.1)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert Zone 2 cache file (.2)"
-
-#~ msgid "Zone"
-#~ msgstr "Zone"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Set manually the Lambert zone (e.g. for locations between two zones)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambert zone"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Select Tableau d'Assemblage"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert Zone 4 cache file (.4)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert Zone 3 cache file (.3)"
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Image grab multiplier:"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Auto-tag source added:"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Set {0}={1} for {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Set {0}={1} for {2} {3}"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Save and Exit"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Remove all currently selected objects from relation"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Remove Selected"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Adjust the position of the selected WMS layer"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Extract building footprints"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Delete Layer"
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Delete and Download"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Combine Anyway"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Download Plugins"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Merge Anyway"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Solve Conflicts"
-
-#~ msgid "autozoom"
-#~ msgstr "autozoom"
-
-#~ msgid "autoload tiles"
-#~ msgstr "autoload tiles"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Auto zoom: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Autoload Tiles: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max zoom lvl: "
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "No intersection found. Nothing was changed."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Only up to two areas can be joined at the moment."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continue anyway"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Please select at least one closed way the should be joined."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" is not closed and therefore can't be joined."
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-
-#~ msgid "Move Down"
-#~ msgstr "Move Down"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relation Editor: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Solve Conflict"
-
-#~ msgid "Move Up"
-#~ msgstr "Move Up"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "No \"via\" node or way found."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "The \"from\" way doesn't start or end at the \"via\" way."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "The \"to\" way doesn't start or end at a \"via\" node."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "More than one \"via\" found."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Colours points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-
-#~ msgid "Update Data"
-#~ msgstr "Update Data"
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "The \"to\" way doesn't start or end at the \"via\" way."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Change the projection to {0} first."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Invalid projection"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Updates the current data layer from the server (re-downloads data)"
-
-#~ msgid "Fade background: "
-#~ msgstr "Fade background: "
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "The selected photos don't contain time information."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Photos don't contain time information"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Found {0} matches of {1} in GPX track {2}"
-
-#~ msgid "Default Values"
-#~ msgstr "Default Values"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Time difference of {0} days)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Matched {0} of {1} photos to GPX track."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Offset between track and photos: {0}m {1}s"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Edit Track of grade 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Edit Track of grade 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Edit Track of grade 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Edit Track of grade 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Edit Track of grade 5"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Demanding Alpine Hiking"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Edit Demanding Alpine Hiking"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Difficult Alpine Hiking"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Edit Difficult Alpine Hiking"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Edit Drawbridge"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Edit Portcullis"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Errors during Download"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Edit Airport"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Select a single, closed way of at least four nodes."
-
-#~ msgid "Board Type"
-#~ msgstr "Board Type"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Edit Information Office"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Guidepost (Hiking)"
-
-#~ msgid "Map Type"
-#~ msgstr "Map Type"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Toggle Full Screen view"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- running version is {0}"
-
-#~ msgid "Full Screen"
-#~ msgstr "Full Screen"
-
-#~ msgid "Add grid"
-#~ msgstr "Add grid"
-
-#~ msgid "Optional"
-#~ msgstr "Optional"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Provide a background layer that displays a map grid"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplicate Ways with an offset"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Displays an OpenLayers background image"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Let other applications send commands to JOSM."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Directly load TCX files from JOSM."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare tracks for uploading to OSM "
-#~ "eg. deleting uninteresting parts of track."
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Click to add route nodes."
-
-#~ msgid "Start routing"
-#~ msgstr "Start routing"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Remove route nodes"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Click and drag to move route nodes."
-
-#~ msgid "<multiple>"
-#~ msgstr "<multiple>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Join Areas: Remove Short Ways"
-
-#~ msgid "Closed Way"
-#~ msgstr "Closed Way"
-
-#~ msgid "Fix relations"
-#~ msgstr "Fix relations"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Joined self-overlapping area"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Login name (e-mail) to the OSM account."
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "The following errors occurred during mass download:"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "An error occurred while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Raster centre: {0}"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Max. Height (metres)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Max. Width (metres)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Max. Length (metres)"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "Communications with {0} established using protocol version {1}"
-
-#~ msgid "Error processing changeset upload response"
-#~ msgstr "Error processing changeset upload response"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "No changeset present for diff upload"
-
-#~ msgid "Not initialized"
-#~ msgstr "Not initialized"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Version number missing from OSM data"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Unknown version: {0}"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Data upload failed for unknown reason"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Cannot read numeric value from response"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Image with path {0} does not exist or is not readable."
-
-#~ msgid "linked"
-#~ msgstr "linked"
-
-#~ msgid "% of lat:"
-#~ msgstr "% of lat:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% of lon:"
-
-#~ msgid "More details"
-#~ msgstr "More details"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Missing attribute \"version\" on OSM primitive with id {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Missing attribute \"type\" on member {0} in relation {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Missing attribute \"ref\" on member in relation {0}"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ChangeRelationMemberRole"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - key 'type' with value exactly 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Resolve {0} tag conflicts in {1} {2}"
-
-#~ msgid "Resolve conflicts in member list of of relation {0}"
-#~ msgstr "Resolve conflicts in member list of relation {0}"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Wrong number of parameters for nodes operator."
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "cannot resolve undecided conflict"
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Resolve version conflicts for {0} {1}"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Incorrect value of id operator: {0}. Number is expected."
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} pending tag conflicts to be resolved"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Tags({0} conflicts)"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "role {0} is not participating in compare pair {1}"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "item {0} not found in list"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "unexpected value of parameter \"index\". Got {0}"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "list in role {0} is currently not participating in a compare pair"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "parameter current out of range: got {0}"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr "Copy my selected elements to the end of the list of merged elements"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Copy their selected element to the start of the list of merged elements"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Freeze the current list of merged elements"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Remove the selected entries from the list of merged elements"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Move up the selected elements by one position"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Move down the selected entries by one position"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Unfreeze the list of merged elements and start merging"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "adjustable {0} not registered yet"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' must not be null"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-
-#~ msgid ""
-#~ "Properties in the merged element. They will replace properties in my "
-#~ "elements when  merge decisions are applied."
-#~ msgstr ""
-#~ "Properties in the merged element. They will replace properties in my "
-#~ "elements when merge decisions are applied."
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "unexpected column index. Got {0}"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr "merged nodes not frozen yet. Can't build resolution command"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "cannot apply undecided tag merge item"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Parameter 'col' must be 0 or 1. Got {0}"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr "WARNING: unexpected value for preference conflict.resolution, got "
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Apply partial resolutions"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Plugin {0} requires JOSM update to version {1}."
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Reached the end of the line"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Select a starting node on the end of a way"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Reached a junction"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgstr[1] "{0} Plugins successfully downloaded. Please restart JOSM."
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigned a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr "A special handler for the French land registry WMS server."
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Download Image from French Cadastre WMS"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr "The projection could not be read from preferences. Using Mercator"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "A special handler of the French cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr "The projection could not be read from preferences. Using Mercator"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Yes, undelete them too"
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Checking whether node {0} is gone ..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Undeleting relation..."
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, cancel operation"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Undelete additional nodes?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Undelete dependent primitives?"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Undeleting Way..."
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-
-#~ msgid "Update Selection"
-#~ msgstr "Update Selection"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Could not find primitive with id {0} in the current dataset"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Missing primitive"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Failed to update the selected primitives."
-
-#~ msgid "Keep mine"
-#~ msgstr "Keep mine"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Checking whether primitive {0} is gone ..."
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "unexpected return value. Got {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitive deleted on the server"
-
-#~ msgid "Delete mine"
-#~ msgstr "Delete mine"
-
-#~ msgid "Update failed"
-#~ msgstr "Update failed"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>There are <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Selection too big"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "There are no selected primitives to update."
-
-#~ msgid "Uploading"
-#~ msgstr "Uploading"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Updates the currently selected primitives from the server"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Updating primitive"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synchronize {0} {1} only"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Conflict detected"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upload to OSM API failed"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-
-#~ msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
-#~ msgstr "Error header \"{0}\" doesn't match expected pattern \"{1}\""
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitive already deleted"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "The following errors occurred during mass download:"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "parameter {0} > 0 required. Got {1}."
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Undelete {0} primitives"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Purging 1 primitive"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Error while communicating with server."
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Deleted or moved primitives"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them on "
-#~ "the server the server is likely to report a<br>conflict.<br><br>Click "
-#~ "<strong>{1}</strong> to check these primitives individually.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them on "
-#~ "the server the server is likely to report a<br>conflict.<br><br>Click "
-#~ "<strong>{1}</strong> to check these primitives individually.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "There's no version valid at date ''{0}'' in this history"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "no latest version found. History is empty."
-
-#~ msgid "changeset"
-#~ msgstr "changeset"
-
-#~ msgid "changesets"
-#~ msgstr "changesets"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "parameter ''{0}'' is not a valid type name, got ''{1}''"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "There's no primitive with version {0} in this history"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "no earliest version found. History is empty."
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parameter ''{0}'' must not be null"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "parameter {0} not in range 0..{1}, got {2}"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Error when communicating with server."
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr "Didn't find an historized primitive with id {0} in this dataset"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "Didn't find an primitive with id {0} and version {1} in this dataset"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "parameter ''{0}'' > 0 expected, got ''{1}''"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Didn't find an primitive with id {0} in this dataset"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "preference ''{0}'' missing. Can't initialize OsmApi"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Login name (e-mail) to the OSM account."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM username (e-mail)"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "mandatory attribute ''{0}'' missing"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "unexpected format of id replied by the server, got ''{0}''"
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Failed to open connection to API {0}"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ 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&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 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"
-#~ "&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."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check these primitives individually.<br>Click <strong>{2}</"
-#~ "strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check these primitives individually.<br>Click <strong>{2}</"
-#~ "strong> to ignore.<br></html>"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Resolve conflicts in node list of way {0}"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simulates a click when you do a small and short drag. This is useful for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA import failure!"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "TangoGPS import failure!"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>The openstreetbugs plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Failed to initialise API. Please try again later."
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API initialisation failed"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "removing reference from relation {0}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "removing reference from way {0}"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Communication with server failed"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Keep my visible state"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Yes, reset the id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "not visible (on the server)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (on the server)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Visible State:"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Physically delete from local dataset"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Keep a clone of the local version"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Yes, purge it"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reset id to 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Keep their visible state"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Remove from dataset"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Undecide conflict between visible state"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "index out of bounds Got {0}"
-
-#~ msgid "History item"
-#~ msgstr "History item"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Failed to load history from the server. Details:<br>{0}</html>"
-
-#~ msgid ""
-#~ "failed to set reference. reference id {0} doesn't match history id {1}"
-#~ msgstr ""
-#~ "failed to set reference. reference id {0} doesn't match history id {1}"
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr ""
-#~ "failed to set reference. reference version {0} not available in history"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr "history not initialised yet. Failed to set current primitive."
-
-#~ msgid "failed to set current. current version {0} not available in history"
-#~ msgstr "failed to set current. current version {0} not available in history"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "History for {0} {1}"
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr "history not initialised yet. Failed to set reference primitive."
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Display the history of the selected primitive"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Loading history for {0} with id {1}"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-
-#~ msgid "image loading..."
-#~ msgstr "image loading..."
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Add {0} {1}"
-
-#~ msgid "No data"
-#~ msgstr "No data"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Change {0} {1}"
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Layer {0} must be in list of layers"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Remove relation member {0} {1}"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Sort the selected relation members or the whole list"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Members: {0} (linked: {1})"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copy defaults"
-
-#~ msgid "Used style"
-#~ msgstr "Used style"
-
-#~ msgid "image "
-#~ msgstr "image "
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Rotate {0} {1}"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "already registered a conflict for primitive ''{0}''"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Zone {0}"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geographisch"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Add a new XML source to the list."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "The XML source (URL or filename) for {0} definition files."
-
-#~ msgid "Icon paths"
-#~ msgstr "Icon paths"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflicts in data"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Defaults (See tooltip for detailed information)"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "The server replied an error with code {0}"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not able to handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not able to handle them. Ignoring changesets."
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "error requesting update: not zoom-level 12"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parameter ''{0}'' must not be null"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Download primitives referring to one of the selected primitives"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Download referrers from OSM..."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Download referrers..."
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Loading parents of primitive {2}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflicts during download"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Merge the currently selected primitives into another layer"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Didn't find a primitive with id {0} in the current dataset"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "upload all changes in one request"
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr "Warning: failed to put a dialog always on top. Exception was: {0}"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Can't search because there is no loaded data."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "The following errors occurred during mass download:{0}"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>Could not read bookmarks.<br>{0}</html>"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Could not write bookmark.<br>{0}</html>"
-
-#~ msgid ""
-#~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
-#~ msgstr ""
-#~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-
-#~ msgid ""
-#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
-#~ "Exception: {0}"
-#~ msgstr ""
-#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
-#~ "Exception: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
-#~ "was: {0}"
-#~ msgstr ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
-#~ "was: {0}"
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is discouraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialog not created yet. Invoke createInstance() first"
-
-#~ msgid ""
-#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Do you really want to delete layer ''{0}''?"
-
-#~ msgid "Confirmation"
-#~ msgstr "Confirmation"
-
-#~ msgid "Delete all"
-#~ msgstr "Delete all"
-
-#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}"
-#~ msgstr "Warning: failed to put dialog always on top. Exception was: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Deleting layer {0} of {1}"
-
-#~ msgid ""
-#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Multiple members referring to same primitive"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-
-#~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
-#~ "{0}"
-#~ msgstr ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
-#~ "{0}"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset before the first member"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset after the last member"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Select relation members which refer to primitives in the current selection"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Select primitives for selected relation members"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "Remove all members referring to one of the selected primitives"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-
-#~ msgid "No, don't apply"
-#~ msgstr "No, don't apply"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Delete the currently selected tags"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr "Zoom to primitive the first selected member refers to"
-
-#~ msgid "child.id >0 expected. Got {1}"
-#~ msgstr "child.id >0 expected. Got {1}"
-
-#~ msgid "Linked"
-#~ msgstr "Linked"
-
-#~ msgid "Could not export \"{0}\""
-#~ msgstr "Could not export \"{0}\""
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-
-#~ msgid ""
-#~ "Warning: failed to put history browser always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Warning: failed to put history browser always on top. Exception was: {0}"
-
-#~ msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-#~ msgstr "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-
-#~ msgid "Fetching a package of {0} from ''{1}''"
-#~ msgstr "Fetching a package of {0} from ''{1}''"
-
-#~ msgid "Fetching {0} with id {1} from ''{2}''"
-#~ msgstr "Fetching {0} with id {1} from ''{2}''"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Expected instance of OsmDataLayer. Got ''{0}''."
-
-#~ msgid "parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "parameter ''{0}'' > 0 required. Got {1}"
-
-#~ msgid "id parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "id parameter ''{0}'' > 0 required. Got {1}"
-
-#~ msgid "Unknown relation member type {0}"
-#~ msgstr "Unknown relation member type {0}"
-
-#~ msgid ""
-#~ "Failed to close changeset {0}, will be closed by server after timeout. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Failed to close changeset {0}, will be closed by server after timeout. "
-#~ "Exception was: {1}"
-
-#~ msgid ""
-#~ "marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too"
-#~ msgstr ""
-#~ "marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "The plugin could not be removed. Probably it was already disabled"
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-
-#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-#~ msgstr "INFO: entering compatibilty mode for JOSM with Main.ds"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Plug-in named {0} is not available. Update skipped."
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the current projection to one of the cadastre\n"
-#~ "projection and retry"
-#~ msgstr ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the current projection to one of the cadastre\n"
-#~ "projection and retry"
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-
-#~ msgid ""
-#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-#~ msgstr ""
-#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Select WMS layer"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Please select the WMS layer to adjust."
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "There are currently no WMS layer to adjust."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr ""
-#~ "<b>id:</b>... - object with given ID (<b>id:0</b> for all new objects)"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WML layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "Nothing find in selection by searching for ''{0}''"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Please enter a filter string."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Always move and don't show dialogue again"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "to {0} primitive"
-#~ msgstr[1] "to {0} primtives"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgstr[1] ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Resolve version conflicts for relation {0}"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Resolve version conflicts for way {0}"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Resolve version conflicts for node {0}"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Warning: Failed to initialise preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Failed to initialise preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "expected id >= 0. Got {0}"
-#~ msgstr "expected id >= 0. Got {0}"
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "a primitive with id=0 can't be invisible"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "can't add node {0} to incomplete way {1}"
-
-#~ msgid "version > 0 expected. Got {0}"
-#~ msgstr "version > 0 expected. Got {0}"
-
-#~ msgid "id > 0 expected. Got {0}"
-#~ msgstr "id > 0 expected. Got {0}"
-
-#~ msgid ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-#~ msgstr ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Conflicts when merging nodes - merged node is ''{0}''"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "The key ''{0}'' and all its values are going to be removed"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Please decided which values to keep"
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "parameter ''{0}'' must not be empty"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "tag collection doesn't include the selected value ''{0}''"
-
-#~ msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-#~ msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-
-#~ msgid "pos {0} is out of range. current number of members: {1}"
-#~ msgstr "pos {0} is out of range. current number of members: {1}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Didn't find an primitive with id {0} in this dataset"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' must not be null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "unexpected return value. Got {0}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "expected id >= 0. Got {0}"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "a primitive with id=0 can't be invisible"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' is not a valid type name, got ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "There's no primitive with version {0} in this history"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "There's no version valid at date ''{0}'' in this history"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "no earliest version found. History is empty."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "no latest version found. History is empty."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parameter current out of range: got {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr "Merged nodes not frozen yet. Can't build resolution command"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "unexpected column index. Got {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr "merged nodes not frozen yet. Can't build resolution command"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter 'col' must be 0 or 1. Got {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parameter ''{0}'' must not be empty"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "tag collection doesn't include the selected value ''{0}''"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "index out of bounds Got {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Display the history of the selected primitive"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Could not read \"{0}\""
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "preference ''{0}'' missing. Can't initialize OsmApi"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "id parameter ''{0}'' > 0 required. Got {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Purged object ''{0}''"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Removing reference from relation {0}"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Purged {0} objects"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "Replace the way this member refers to with the combined way"
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "No type found. History is empty."
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronised adjustment."
-
-#~ msgid "Update selections"
-#~ msgstr "Update selections"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Updates the objects in the current data layer from the server."
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr ""
-#~ "Upload all changes in the current current selection to the OSM server."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Upload all changes in the current data layer to the OSM server"
-
-#~ msgid "Tag modified relations with   "
-#~ msgstr "Tag modified relations with   "
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Select primitives submitted by this user"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Apply also for children"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Value of child.getId() > 0 expected. Got {1}."
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgstr[1] ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Please enter a comment for this upload changeset (min. 3 characters)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Illegal upload comment"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} object to modifiy:"
-#~ msgstr[1] "{0} objects to modify:"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Open a new changeset"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Upload all changes in one request"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Upload data to an already opened changeset"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Use an open changeset"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Preparing primitives to upload ..."
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "track"
-#~ msgstr[1] "tracks"
-
-#~ msgid ""
-#~ "Please consult the Conflict List Dialog<br>and manually resolve them."
-#~ msgstr ""
-#~ "Please consult the Conflict List Dialogue<br>and manually resolve them."
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Preset group ''{0}'' of group ''{1}''"
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgstr[1] ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Exactly four doubles expected in string, got {0}"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Please enter a valid latitude in the range -90..90"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Please enter a latitude in the range -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Please enter a valid longitude in the range -180..180"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Please enter a longitude in the range -180..180"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Fullscreen View"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Toggle Fullscreen view"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" is not closed and therefore cannot be joined."
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Cannot open directory.<br>Please select a file!"
-
-#~ msgid ""
-#~ "When one or more ways are selected, the shape is adjusted such, that all "
-#~ "angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-#~ "Then, the direction is fixed by these two reference nodes.(Afterwards, "
-#~ "you can undo the movement for certain nodes:<br>Select them and press the "
-#~ "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
-#~ msgstr ""
-#~ "When one or more ways are selected, the shape is adjusted such, that all "
-#~ "angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-#~ "Then, the direction is fixed by these two reference nodes.(Afterwards, "
-#~ "you can undo the movement for certain nodes:<br>Select them and press the "
-#~ "shortcut for Orthogonalise / Undo. The default is Shift-Q.)"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Wrong number of parameters for tags operator."
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr "Incorrect value of changeset operator: {0}. Number is expected."
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "Incorrect value of version operator: {0}. Number is expected."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Undelete {0} primitive"
-#~ msgstr[1] "Undelete {0} primitives"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Error: Unexpected line ''{0}'' in bookmark list from server"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Missing merge target for object with id {0}"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "The \"from\" way does not start or end at a \"via\" node."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "The \"to\" way does not start or end at a \"via\" node."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "The \"from\" way does not start or end at the \"via\" way."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "The \"to\" way does not start or end at the \"via\" way."
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (France)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 North Geodesic system"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ ">There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgstr[1] ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgstr[1] ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete them too?"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Download and show the history of the selected primitives"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Zoom to the corresponding primitives in the current data layer"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Enter a changset id"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "You are setting an empty role on {0} primitive."
-#~ msgstr[1] "You are setting an empty role on {0} primitives."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "This is equal to deleting the roles of these primitives."
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Click do download the currently selected area"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information.You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information.You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Enter an upload comment (min. 3 characters)"
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "Please enter the password name of your OSM account"
-
-#~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-#~ msgstr ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-
-#~ msgid ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-#~ msgstr ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-
-#~ msgid ""
-#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
-#~ "to map editing.<br>"
-#~ msgstr ""
-#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
-#~ "to map editing.<br>"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Uploading {0} objects ..."
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgstr[1] ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-
-#~ msgid "GPS point"
-#~ msgstr "GPS point"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-
-#~ msgid ""
-#~ "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-
-#~ msgid ""
-#~ "<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 do not 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, ''.''/Period 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>"
-#~ 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 do not 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, ''.''/Period 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>"
-
-#~ msgid "Active styles"
-#~ msgstr "Active styles"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Available styles (from {0})"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Add a filename or an URL of an active style"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Warning: no preference ''{0}'' found."
-
-#~ msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-#~ msgstr "<html>Could not read files.<br> Error is: <br>{0}</html>"
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-
-#~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
-#~ "and internal id {2}"
-#~ msgstr ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
-#~ "and internal id {2}"
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-
-#~ msgid "loading plugin ''{0}''"
-#~ msgstr "loading plugin ''{0}''"
-
-#~ msgid "Removing umaintained plugins..."
-#~ msgstr "Removing umaintained plugins..."
-
-#~ msgid ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-#~ msgstr ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-
-#~ msgid "Do not check and ask again at startup (remembers choice)"
-#~ msgstr "Do not check and ask again at startup (remembers choice)"
-
-#~ msgid ""
-#~ "You have encountered an error in JOSM. Before you file a bug reportmake "
-#~ "sure you have updated to the latest version of JOSM here:"
-#~ msgstr ""
-#~ "You have encountered an error in JOSM. Before you file a bug reportmake "
-#~ "sure you have updated to the latest version of JOSM here:"
-
-#~ msgid ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-#~ msgstr ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-
-#~ msgid ""
-#~ "There the error information provided below should already befilled in for "
-#~ "you. Please include information on how to reproducethe error and try to "
-#~ "supply as much detail as possible."
-#~ msgstr ""
-#~ "There the error information provided below should already befilled in for "
-#~ "you. Please include information on how to reproducethe error and try to "
-#~ "supply as much detail as possible."
-
-#~ msgid ""
-#~ "Alternatively, if that does not work you can manually fill in the "
-#~ "informationbelow at this URL:"
-#~ msgstr ""
-#~ "Alternatively, if that does not work you can manually fill in the "
-#~ "informationbelow at this URL:"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Multipolygon must consist only of closed ways."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "You must select at least two ways."
-
-#~ msgid "create new objects"
-#~ msgstr "create new objects"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Min zoom lvl: "
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Multipolygon inner way is outside."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Non-Way in multipolygon."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copy Selected Default(s)"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-
-#~ msgid "Bikes"
-#~ msgstr "Bikes"
-
-#~ msgid "Travel"
-#~ msgstr "Travel"
-
-#~ msgid "Man-Made"
-#~ msgstr "Man-Made"
-
-#~ msgid "any substance"
-#~ msgstr "any substance"
-
-#~ msgid "underwater"
-#~ msgstr "underwater"
-
-#~ msgid "overground"
-#~ msgstr "overground"
-
-#~ msgid "tower"
-#~ msgstr "tower"
-
-#~ msgid "line"
-#~ msgstr "line"
-
-#~ msgid "minor_line"
-#~ msgstr "minor_line"
-
-#~ msgid "black"
-#~ msgstr "black"
-
-#~ msgid "brown"
-#~ msgstr "brown"
-
-#~ msgid "red"
-#~ msgstr "red"
-
-#~ msgid "blue"
-#~ msgstr "blue"
-
-#~ msgid "gray"
-#~ msgstr "gray"
-
-#~ msgid "white"
-#~ msgstr "white"
-
-#~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-#~ msgstr ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-
-#~ msgid "Authenticationi failed"
-#~ msgstr "Authentication failed"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr "<html>Cannot open directory.<br>Please select a file!</html>"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr "Move nodes so all angles are 90 or 270 degrees"
-
-#~ msgid ""
-#~ "Primitive {0} cannot be added to the relation because it was deleted."
-#~ msgstr ""
-#~ "Primitive {0} cannot be added to the relation because it was deleted."
-
-#~ msgid "Node {0} cannot be added to the way because it was deleted"
-#~ msgstr "Node {0} cannot be added to the way because it was deleted"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-
-#~ msgid "Error: "
-#~ msgstr "Error: "
-
-#~ msgid "Download Object"
-#~ msgstr "Download Object"
-
-#~ msgid "Download Object..."
-#~ msgstr "Download Object..."
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Merging deleted primitives failed"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialogue and manually resolve it."
-#~ msgstr[1] ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialogue and manually resolve them."
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-
-#~ msgid ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-#~ msgstr ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-
-#~ msgid "loading plugin ''{0}'' ({1})"
-#~ msgstr "loading plug-in ''{0}'' ({1})"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Could not load plug-in {0} because the plug-in<br>main class "
-#~ "''{1}'' was not found.<br>Delete from preferences?"
-
-#~ msgid ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-#~ msgstr ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Point on angle of building to start drawing"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Point on opposite end of building"
-
-#~ msgid "Set width of building"
-#~ msgstr "Set width of building"
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Loads calibration data to a file"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Image not created properly."
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "A plug-in that allows JOSM to be controlled from other applications."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Settings for the Remote Control plug-in."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "The Remote Control plug-in will always listen on port 8111 on localhost."
-#~ "The port is not variable because it is referenced by external "
-#~ "applications talking to the plug-in."
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Settings for the SlippyMap plug-in."
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS Plug-in Preferences"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Modify list of WMS servers displayed in the WMS plug-in menu"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Allows the user to create different colour schemes and to switch between "
-#~ "them. Just change the colours and create a new scheme. Used to switch to "
-#~ "a white background with matching colours for better visibility in bright "
-#~ "sunlight. See dialogue in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Another plug-in to match images to the waypoints in a GPX file. A match "
-#~ "is made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag "
-#~ "matches the filename of an image."
-
-#~ msgid "Indipend."
-#~ msgstr "Indipend."
-
-#~ msgid "Grab buildings"
-#~ msgstr "Grab buildings"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Grab building layer only"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Extract building on click (vector images only)"
-
-#~ msgid "Create new turn restriction in layer ''{0}''"
-#~ msgstr "Create new turn restriction in layer ''{0}''"
-
-#~ msgid "Edit new turn restriction in layer ''{0}''"
-#~ msgstr "Edit new turn restriction in layer ''{0}''"
-
-#~ msgid "Edit turn restriction #{0} in layer ''{1}''"
-#~ msgstr "Edit turn restriction #{0} in layer ''{1}''"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Insert 'via' objects from the clipboard"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "T5 - difficult, exposed, steep alpine trail with climbing"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "T6 - difficult, hazardous alpine trail with climbing"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "T2 - mountain hiking trail"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "T3 - difficult, exposed hiking trail"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "T4 - difficult, exposed, steep alpine trail. Hands needed"
+#~ "Replace the original white background by the backgound colour defined in "
+#~ "JOSM preferences."
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Open an editor for the selected turn restricion"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 26529)
+++ applications/editors/josm/i18n/po/es.po	(revision 26530)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-28 11:33+0000\n"
-"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-02 08:08+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:48+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:42+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Ayuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de archivo incorrecta: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,15 +119,15 @@
 msgstr "Atención"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "El parámetro \"downloadgps\" no acepta nombres de archivo o URLs de archivo."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL incorrecta: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "previa de JOSM (compatible con Java 5).</li></ul>Más información:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Salir de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Continuar, intentar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -391,6 +392,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -417,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -423,7 +424,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -431,5 +433,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -639,5 +641,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -889,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -896,5 +898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1084,6 +1086,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1236,5 +1238,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1473,6 +1475,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2156,5 +2158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2472,7 +2474,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Descargar datos"
@@ -2733,7 +2735,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2870,10 +2871,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3045,5 +3046,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3662,6 +3663,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Datos potencialmente erróneos. ¿Cargarlos a pesar de ello?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3711,40 +3712,40 @@
 msgstr "Nodos cambiados de {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Eliminar \"{0}\" por nodo ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Eliminar \"{0}\" para vía ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Eliminar \"{0}\" para la relación ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Set {0}={1} for node ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Fijar {0}={1} para la vía ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Fijar {0}={1} para la relación ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Eliminar \"{0}\" para {1} objetos"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3874,4 +3875,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Confirmación antes de borrar"
@@ -4192,9 +4194,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Aviso: Error al inicializar las preferencias. Fallo al reiniciar el archivo "
-"de preferencias por defecto. {0}."
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4230,8 +4230,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Atención: Número de versión de JOSM inesperado en el fichero de revisión, el "
-"valor es ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4340,10 +4338,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM esperaba encontrar la primitiva [{0} {1}] en el conjunto de datos pero "
-"no fue así. Por favor, informe de ello en http://josm.openstreetmap.de. Este "
-"no es un error crítico, puede continuar con su trabajo de manera segura."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4447,5 +4442,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4464,8 +4459,8 @@
 msgstr "multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4609,52 +4604,64 @@
 msgstr "WGS84 Geográfica"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Aviso: Error al abrir la secuencia de entrada para el recurso ''/ data/"
-"{0}''. No se puede cargar NTF <-> malla RGF93"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Zonas Lambert 4 (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} a {2} grados)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Córcega)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Zona CC-Lambert"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Zona Lambert CC9 (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4683,81 +4690,101 @@
 "configurar las preferencias para que se ajusten al código ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Zona PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 zona {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Rejilla suiza (Suiza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Letonia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Zona UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Norte"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Sur"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Hemisferio"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Corrimiento 3.000.000m este"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupe Fuerte Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadalupe Sta Ana 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinica Fuerte Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Isla Reunión RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Francia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "Sistema geodésico UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4982,45 +5009,45 @@
 msgstr "Este test analiza si los multipolígonos son válidos"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "La vía estilo área no ha sido cerrada"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Ninguna vía exterior para el multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Multipolígono sin estilo"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Relación multipolígono sin estilo"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Estilo de vía interna es multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Estilo para vía externa no compatible"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "El multipolígono no está cerrado"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "vía interna multipolígono está afuera"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Intersección entre vías multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Miembro de multipolígono no tiene un rol útil"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "No-vía dentro de multipolígono"
@@ -5301,5 +5328,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5324,5 +5351,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5333,5 +5360,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5751,5 +5778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5819,5 +5846,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "vía"
@@ -5825,5 +5852,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5831,10 +5858,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vía fluvial"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "uso del suelo"
@@ -5844,5 +5871,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5856,5 +5883,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5867,5 +5894,5 @@
 msgstr "transporte público"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6233,5 +6260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6343,4 +6370,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6447,5 +6475,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6494,11 +6522,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Alternativamente puede introducir una <strong>dirección de tesela</"
-"strong> para una tesela en el formato <i>nivel_de_zoom/x/y</i>, por ejemplo "
-"<i>15/256/223</i>.Las direcciones de tesela en el formato <i>zoom,x,y</i> o "
-"<i>zoom;x;y</i> también son válidas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6794,9 +6818,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista de elementos fusionados. Sustituirán a mis elementos cuando se aplique "
-"la decisión de combinarlos."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -7053,10 +7075,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Mantener mis coordenadas"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Mantener sus coordenadas"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7115,6 +7137,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7136,6 +7158,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7555,5 +7577,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7802,5 +7824,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -8015,6 +8037,36 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
 msgstr "desconocido"
 
@@ -8279,5 +8331,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8299,5 +8351,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8314,5 +8366,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Descargar miembros incompletos de las relaciones seleccionadas"
@@ -8320,5 +8372,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Descargar miembros incompletos"
@@ -8361,5 +8413,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8367,5 +8419,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8568,5 +8620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8672,5 +8724,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Usuario"
@@ -9668,5 +9719,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9848,5 +9899,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -10003,4 +10054,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Sólo modificaciones realizadas por mí"
@@ -10015,4 +10067,10 @@
 "Sólo modificaciones realizadas por el usuario con el siguiente "
 "nombrecambioscambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10313,9 +10371,9 @@
 msgstr "La URL de consulta de modificaciones no es válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10324,13 +10382,13 @@
 msgstr[1] "Se modificarán {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Un valor vacío borra el atributo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10343,18 +10401,19 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "¿Modificar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Reemplazar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10363,5 +10422,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10371,5 +10430,5 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10378,28 +10437,32 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor, seleccione los objetos a los que desea cambiar las propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10408,62 +10471,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Posición"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Ir a la wiki de OSM mostrar la ayuda de etiqueta (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Inicia el navegador con ayuda de la wiki para el objeto seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Seleccionar la relación en la selección principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Elige los miembros de la relación seleccionada"
@@ -10531,10 +10594,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Aviso: Ignorando la excepción porque se ha cancelado la tarea. Excepción: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10556,7 +10620,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Descargando {0} hijo incompleto de {1} relaciones de padre"
-msgstr[1] "Descargando {0} hijos incompletos de {1} relaciones de padre"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10922,10 +10986,4 @@
 msgstr "Existió {0} conflictos durante la importación."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Aviso: Se ignora la excepción porque la tarea se ha cancelado. Error: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10966,12 +11024,4 @@
 msgid "Load relation"
 msgstr "Cargar relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Atención: se ignora la excepción debido a que la tarea fue cancelada. La "
-"excepción era: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11257,37 +11307,4 @@
 msgstr "Tipo"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "desconocido"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11414,20 +11431,20 @@
 msgstr "Coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Histórico del nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Histórico de la vía {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Histórico de la relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Recargar el historial desde el servidor"
@@ -11529,6 +11546,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Conjunto de cambios"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12137,14 +12154,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Una subida y/o una operación de guardado de una de las capas con "
-"modificaciones<br>ha sido cancelada o ha fallado.</html>"
 msgstr[1] ""
-"<html>Hay subidas y/o operaciones de {0} capas con modificaciones<br>que han "
-"sido canceladas o han fallado.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12591,4 +12604,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12621,13 +12635,4 @@
 "<br>excede el tamaño máximo de conjuntos de cambios de {1} en el servidor "
 "\"{2}\" </html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Se requiere <strong>varios conjuntos de cambios</strong>para subir {0} "
-"objetos. ¿Qué estrategia desea emplear?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12705,38 +12710,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Personalizar colores"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Predeterminado"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nombre: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12747,9 +12752,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12757,26 +12762,26 @@
 msgstr "Descripción"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Intervalo de tiempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Longitud: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12785,8 +12790,8 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12795,12 +12800,12 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12809,10 +12814,10 @@
 msgstr[1] "{0} trazas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12822,78 +12827,78 @@
 "<br>Si desea subir trazas, ver:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Descargar cercanos:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "Solamente trazas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "Solamente puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "trazas y puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12904,11 +12909,11 @@
 "¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12919,6 +12924,6 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12928,27 +12933,27 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12961,29 +12966,29 @@
 "correlacionar con datos de audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "No es posible importar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -13090,5 +13095,5 @@
 msgstr "Se encontraron los siguientes problemas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13098,57 +13103,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Cargar teselas automáticamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Mostrar información de la tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Incrementar zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Reducir zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Ajustar al tamaño de la tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Alinear caché de teselas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "haga zoom acercando para cargar cualquier tesela"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "haga zoom acercando para cargar más teselas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "incrementa el nivel de zoom para ver más detalles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "No hay teselas a este nivel de zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13703,10 +13716,10 @@
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13714,5 +13727,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13721,22 +13734,22 @@
 msgstr[1] "{0} consiste en los marcadores {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "No existen marcadores de audio en esta capa desde los que desplazar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Mostrar Texto/Íconos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 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/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13744,5 +13757,5 @@
 "Necesita pausar el audio en el momento que oiga su entrada de sincronización"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13750,14 +13763,14 @@
 msgstr "Audio sincronizado en el punto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "No se puede sincronizar en la capa que se escuchaba."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Crear un marcador de audio en la cabecera de escucha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13787,13 +13800,13 @@
 msgstr "No se ha podido crear un marcador de audio nuevo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(La URL era: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Error mostrando la URL"
@@ -14863,53 +14876,53 @@
 msgstr "Colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Dibuja flechas de sentido único."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Dibujar solo el contorno de las áreas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
@@ -14918,10 +14931,10 @@
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14930,10 +14943,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14942,9 +14955,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14954,15 +14967,51 @@
 "especificada en el estilo seleccionado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automático"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Nombre"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Desc(ripción)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Ninguno"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14973,39 +15022,31 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Archivos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Ninguno"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Forzar lineas si no hay segmentos importados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Dibujar más grandes los puntos GPS"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Dibujar el valor HDOP de forma circular"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -15013,9 +15054,9 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -15023,5 +15064,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -15045,5 +15086,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15086,5 +15127,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15098,38 +15139,18 @@
 msgstr "Pie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Crear marcadores al leer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automático"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Nombre"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Desc(ripción)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Ambos"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15140,10 +15161,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15153,10 +15174,10 @@
 "Valor ''-1'' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15165,10 +15186,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15177,10 +15198,10 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15189,5 +15210,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15196,14 +15217,14 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15213,13 +15234,13 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15229,10 +15250,10 @@
 "(HDOP). Su dispositivo de captura requiere dejar traza de esta información."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -15240,18 +15261,36 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Etiquetado de punto de ruta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15953,11 +15992,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSM escuchará siempre el puerto 8111 de localhost. Este puerto no es "
-"configurable porque es referenciado por aplicaciones externas que se "
-"comunican con JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -16046,5 +16082,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reiniciar"
@@ -16349,6 +16385,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Actualizar siempre sin preguntar"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16777,5 +16813,5 @@
 msgstr "Nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16804,9 +16840,9 @@
 msgstr "Buscar predefinidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "La muestra sólo es aplicable a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Buscar en etiquetas"
@@ -17114,9 +17150,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Ocurrió un error al interpretar el fichero gpx {0}. Sólo parte del fichero "
-"estará disponible"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17458,8 +17492,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"El prólogo del documento OsmChange no se ha escrito aún. Por favor escriba "
-"uno."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17692,10 +17724,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Hace falta atributos obligatorios en el elemento \"bounds\". Se obtuvo "
-"minlon=\"{0}\", minlat=\"{1}\", maxlon=\"{3}\", maxlat=\"{4}\", origin="
-"\"{5}\""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -18110,4 +18139,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -19046,4 +19080,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -19183,4 +19219,18 @@
 msgstr "Error al cargar el esquema XML."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19758,5 +19808,5 @@
 #: build/trans_plugins.java:41
 msgid "Fast drawing ways by mouse"
-msgstr ""
+msgstr "Dibujo rápido de vías mediante el ratón."
 
 #. Plugin FixAddresses
@@ -19776,6 +19826,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Permite filtrar las trazas GPS innecesarias"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
@@ -19819,6 +19869,6 @@
 msgstr ""
 "Puede ser útil cuando esté mejorando la precisión de las vías ya existentes. "
-"La idea del plugin es sustituir arrastrar y soltar nodos con hacer click "
-"sobre ellos, para acelerar el proceso de edición."
+"La idea del componente es sustituir el arrastrar y soltar nodos con el hacer "
+"clic sobre ellos, para acelerar el proceso de edición."
 
 #. Plugin InfoMode
@@ -19828,4 +19878,6 @@
 "trackpoint info"
 msgstr ""
+"Ventana emergente con información adicional sobre los objetos de la capa "
+"actual - Actualmente con información sobre las trazas GPX."
 
 #. Plugin irsrectify
@@ -19873,4 +19925,7 @@
 "this plugin."
 msgstr ""
+"El componente MapDust muestra los informes de errores de MapDust en el mapa. "
+"Permite crear, cerrar, invalidar, reabrir y comentar los informes de errores "
+"mediante el uso de esta extensión."
 
 #. Plugin measurement
@@ -19983,5 +20038,5 @@
 #: build/trans_plugins.java:105
 msgid "adds projections from Proj4J"
-msgstr "Agrega nuevas proyecciones a partir de biblioteca Proj4J"
+msgstr "Agrega nuevas proyecciones geográficas mediante la biblioteca Proj4J"
 
 #. Plugin public_transport
@@ -20147,7 +20202,7 @@
 "objects."
 msgstr ""
-"(Este plugin actualmente es un trabajo en progreso!!!) Enlaza y sincroniza "
-"un video georeferenciado frente a una traza GPS, para identificar los "
-"objetos visibles."
+"(¡¡¡Este componente actualmente es un trabajo en desarrollo!!!) Enlaza y "
+"sincroniza un vídeo georreferenciado ajustándolo a su posición en la traza "
+"GPS.Util para identificar objetos visibles."
 
 #. Plugin walkingpapers
@@ -29006,5 +29061,5 @@
 #: build/trans_presets.java:2621 build/trans_presets.java:2630
 msgid "rugby_league"
-msgstr "liga_de_rugby"
+msgstr "rugby"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29015,5 +29070,5 @@
 #: build/trans_presets.java:2621 build/trans_presets.java:2630
 msgid "rugby_union"
-msgstr "unión_de_rugby"
+msgstr "rugby_union"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29706,5 +29761,5 @@
 #: build/trans_presets.java:2760
 msgid "American Football"
-msgstr "Fútbol Americano"
+msgstr "Fútbol americano"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
@@ -29736,20 +29791,20 @@
 #: build/trans_presets.java:2778
 msgid "Rugby League"
-msgstr "Liga de Rugby"
+msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
 #: build/trans_presets.java:2779
 msgid "Edit Rugby League"
-msgstr "Editar Liga de Rugby"
+msgstr "Editar liga de rugby"
 
 #. item "Sport (Ball)/Rugby Union"
 #: build/trans_presets.java:2784
 msgid "Rugby Union"
-msgstr "Unión de Rugby"
+msgstr "Rugby union o rugby 15"
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
 #: build/trans_presets.java:2785
 msgid "Edit Rugby Union"
-msgstr "Editar Unión de Rugby"
+msgstr "Editar rugby union o rugby 15"
 
 #. item "Sport (Ball)/Baseball"
@@ -32269,5 +32324,5 @@
 #: build/trans_presets.java:4041
 msgid "Edit Greenfield Landuse"
-msgstr "Editar suelo en contrucción"
+msgstr "Editar suelo urbanizable"
 
 #. item "Land use/Landfill"
@@ -35590,5 +35645,5 @@
 #: build/trans_style.java:2791
 msgid "greenfield"
-msgstr "área rururbana"
+msgstr "Suelo urbanizable"
 
 #. <icon src="misc/no_icon.png"/>
@@ -36177,4 +36232,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -36191,6 +36247,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -36209,15 +36265,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "nombre abreviado de la calle"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "Nodo etiquetado como vía unidireccional"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "Nodo etiquetado como puente"
@@ -36228,12 +36284,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "Nodo con etiqueta de vía errónea"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Carretera sin clasificar sin nombre"
@@ -36242,16 +36298,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "carretera sin referencia"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "Tipo de carretera temporal"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "Nombre de clave mal escrito"
@@ -36261,10 +36317,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "vía ciclista con etiqueta bicicleta"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "vía peatonal con etiqueta a pie"
@@ -36273,10 +36329,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "carril bici etiquetado como vía ciclable"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Barrera utilizada en una vía"
@@ -36285,35 +36341,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "velocidad máxima usada en una vía peatonal"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "etiqueta capa con el signo +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "El nombre de la calle contiene ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relación sin tipo"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurante sin nombre"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "combinación de etiquetas inusual"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36418,117 +36483,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "Serie 7(OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "Japón MLIT(ORTO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japón (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japón (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japón (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italia"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italia"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps(Francia)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA (España)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Dinamarca)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36781,6 +36856,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Subida cancelada"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36883,9 +36958,9 @@
 msgstr "(No hay datos de elevación)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36903,23 +36978,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36927,26 +37032,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Información del complemento"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36954,6 +37087,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Fijar dirección"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -37063,9 +37196,9 @@
 msgstr "Mostrar direcciones incompletas"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "elementos"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "no hay elementos"
@@ -37169,17 +37302,34 @@
 msgstr "Seleccionar todas las direcciones con datos incompletos"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Propiedades de la capa"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Importar imagen"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Importar imagen georreferenciada"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Error mientras se creaba la capa imagen: "
@@ -37897,32 +38047,35 @@
 msgstr "Seleccionar comuna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Plugin cadestre-fr usado tradicionalmente para detectar el acceso directo "
-"del teclado F11\n"
-"que esta asignado en este momento para el cambio a pantalla completa\n"
-"Desea restaurar la tecla F11 para la ejectuar la acción TOMAR?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Restaurar atajo F11 para obtener"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM está detenido para que el cambio surta efecto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -38053,9 +38206,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Sustituir el fondo original blanco por el color de fondo definido en la "
-"preferencias de JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38985,5 +39136,5 @@
 msgstr "Añadir capa EGPX"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38993,17 +39144,17 @@
 "mapa se considera peligroso.<br>Si quiere subir sus trazas, consulte aquí:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar líneas entre puntos para esta capa"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar líneas entre puntos para esta capa"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
@@ -39155,5 +39306,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -39161,10 +39312,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -39173,5 +39324,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -39180,6 +39331,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -39188,9 +39339,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -39349,71 +39500,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Crear"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39421,32 +39580,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -39481,6 +39634,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -39611,30 +39764,43 @@
 msgstr "Importando..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -40342,5 +40508,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -40357,5 +40523,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -41099,17 +41265,17 @@
 msgstr "Nueva capa de imágenes desde el portapapeles"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Imágenes de archivos soportadas"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Nueva capa de imágenes desde un archivo..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "No se encontró el objeto mapa."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer falló al cargar o importar la imagen."
@@ -41123,43 +41289,33 @@
 msgstr "Los datos del portapapeles no son una imagen"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "Se encontró un fichero de calibración asociado a la imagen:"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(elija \"{0}\" para si/no/preguntar en las preferencias\n"
-"para controlar la carga automática de los archivos\n"
-"de calibración)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "¿Desea aplicarlo?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "¿Cargar archivo de calibración?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Se aplicará automáticamente."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr "De ahora en adelante los archivos cal se cargarán automáticamente."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Elija \"{0}\" de si/no/preguntar en las preferencias\n"
-"para controlar la carga automática de los archivos\n"
-"de calibración."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -41780,5 +41936,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -42777,4 +42933,21 @@
 msgstr "Crear una nueva llave para firmar"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -43008,12 +43181,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
-"Esta restricción de giro se refiere a un objeto que ha sido eliminado fuera "
-"de este editor de restricción de giro:"
 msgstr[1] ""
-"Esta restricción se refiere a {0} objetos que han sido eliminados fuera de "
-"este editor de restricción de giro:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -43274,6 +43443,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Abrir un editor para la restricción de giro seleccionada"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43900,6 +44069,6 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
-msgstr "Serán conectadas las vías adyacentes. Los nodos se deseleccionarán."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java:23
@@ -44305,3723 +44474,75 @@
 msgstr "Conduce un coche de carreras en esta capa"
 
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "No data imported."
-#~ msgstr "No se importó ningún dato."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Subir todos los cambios al servidor OSM."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de archivo desconocida."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ningún documento abierto luego nada por grabar."
-
-#~ msgid "Email"
-#~ msgstr "Correo Electrónico"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contacto {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "Descargando..."
-
-#~ msgid "Uploading data"
-#~ msgstr "Subiendo datos"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
+#~ msgid "Change values?"
+#~ msgstr "¿Modificar valores?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "combinación de etiquetas inusual"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Subida cancelada"
+
+#~ msgid ""
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Existen algunos conflictos sin resolver. Tienes que solucionarlos primero."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "No implementado aún."
-
-#~ msgid "gps track description"
-#~ msgstr "Descripción de la traza GPS"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Combinar conflictos"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Por favor, introduzca una cadena de búsqueda."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Refrescar la lista de selección."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Borrar la capa seleccionada"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver conflictos"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "una traza con {0} punto"
-#~ msgstr[1] "una traza con {0} puntos"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punto"
-#~ msgstr[1] "puntos"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} borrados.)"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Existieron conflictos durante la importación"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
+#~ "Sustituir el fondo original blanco por el color de fondo definido en la "
+#~ "preferencias de JOSM."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Mantener sus coordenadas"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Mantener mis coordenadas"
+
+#~ msgid ""
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "No se han encontrado imágenes con metadatos legibles sobre la fecha y "
-#~ "hora."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Iniciar GPS: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Finalizar GPS: {0}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "No hay hora para el punto {0} x {1}"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "La hora no pudo ser analizada sintácticamente."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contactando con el servidor OSM..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Error mientras se analizaba sintácticamente"
-
-#~ msgid "their version:"
-#~ msgstr "su versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión resuelta:"
-
-#~ msgid "my version:"
-#~ msgstr "mi versión:"
+#~ "Lista de elementos fusionados. Sustituirán a mis elementos cuando se "
+#~ "aplique la decisión de combinarlos."
 
 #~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Validar contraseña de la cuenta OSM. Dejar en blanco para no guardar "
-#~ "ninguna clave."
-
-#~ msgid "Unknown version"
-#~ msgstr "Versión desconocida"
-
-#~ msgid "to"
-#~ msgstr "a"
-
-#~ msgid "position"
-#~ msgstr "posición"
-
-#~ msgid "different"
-#~ msgstr "diferente"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "true"
-#~ msgstr "verdadero"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imagen"
-#~ msgstr[1] "imagenes"
-
-#~ msgid "timezone difference: "
-#~ msgstr "diferencia de zona horaria: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} dentro de la traza."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sincronizar reloj"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: "
+#~ "{0}"
+
+#~ msgid ""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Cambios no guardados"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Validar nombre (correo-e) de la cuenta OSM"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Preparando datos..."
-
-#~ msgid "OSM password"
-#~ msgstr "Contraseña OSM"
-
-#~ msgid "Aborting..."
-#~ msgstr "Abortando..."
-
-#~ msgid "Change"
-#~ msgstr "Modificar"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ "Aviso: Error al inicializar las preferencias. Fallo al reiniciar el "
+#~ "archivo de preferencias por defecto. {0}."
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
-
-#~ msgid "layer not in list."
-#~ msgstr "capa no listada"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nombre de usuario OSM (correo electrónico)"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "delta actual: {0}s"
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL base del servidor"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Abrir la ventana de preferencias globales."
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punto"
-#~ msgstr[1] "{0} puntos"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "No pudieron leerse los marcadores."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "No pudieron escribirse los marcadores."
-
-#~ msgid "Faster Forward"
-#~ msgstr "Avance rápido"
-
-#~ msgid "Next Marker"
-#~ msgstr "Marcador siguiente"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Marcador anterior"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Introduzca valores para todos los conflictos."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Esos nodos no están en un círculo."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Por favor, seleccione al menos una tarea para descargar"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error mientras se cargaba la página {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Abrir en el navegador"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
+#~ "Atención: Número de versión de JOSM inesperado en el fichero de revisión, "
+#~ "el valor es ''{0}''"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Error en el análisis sintáctico: estructura de documento invalida para un "
-#~ "documento gpx"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Complemento no encontrado: {0}."
+#~ "Aviso: Ignorando la excepción porque se ha cancelado la tarea. Excepción: "
+#~ "{0}"
 
 #~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "(Puede modificar el número de días tras el cual aparecerá el "
-#~ "aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "El complemento requiere actualizar JOSM: {0}."
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando…"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Subiendo..."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Fuentes de datos y tipos"
-
-#~ msgid "y from"
-#~ msgstr "y desde"
-
-#~ msgid "zoom level"
-#~ msgstr "Nivel de zoom"
-
-#~ msgid "x from"
-#~ msgstr "x desde"
-
-#~ msgid "Download Area"
-#~ msgstr "Descargar área"
-
-#~ msgid "Amenities"
-#~ msgstr "Servicios"
-
-#~ msgid "Charge"
-#~ msgstr "Pago"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Número de cables"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianista"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Editar rugby"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Encontrado elemento <nd> en una no Vía"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> no tiene ref"
+#~ "Aviso: Se ignora la excepción porque la tarea se ha cancelado. Error: {0}"
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Advertencia - Se a requerido la carga del complemento {0} . Este "
-#~ "complemento ya no es necesario."
-
-#~ msgid "Enter Password"
-#~ msgstr "Introduzca contraseña"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Existen cambios sin guardar. ¿Desea descartarlos y continuar?"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Por favor, introduzca las coordenadas deseadas primero."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Por favor, introduzca un nombre para la localización."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Seleccione un marcador primero."
+#~ "Aviso: Error al abrir la secuencia de entrada para el recurso ''/ data/"
+#~ "{0}''. No se puede cargar NTF <-> malla RGF93"
+
+#~ msgid "Changeset"
+#~ msgstr "Conjunto de cambios"
 
 #~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "No dibujar flechas si no están por lo menos a esta distancia de la "
-#~ "anterior"
-
-#~ msgid "Edit Football"
-#~ msgstr "Editar fútbol americano"
-
-#~ msgid "Football"
-#~ msgstr "Fútbol americano"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Deportes de motor"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Editar deportes de motor"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Gracias por su comprensión</p>"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Además, los atajos de teclado se activan cuando las acciones se "
-#~ "asignan a una entrada de menú de un botón por primera vez. Así que "
-#~ "algunos de sus cambios pueden activarse incluso sin reiniciar --- pero "
-#~ "sin gestión de colisión. Este es otro motivo por el que debe "
-#~ "<b>reiniciar</b> JOSM antes de hacer ningún cambio aquí.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Debe saber que la lista de selección de teclas de la siguiente página, "
-#~ "enumera no solo las teclas que existen en su teclado, sino todas las "
-#~ "teclas que existen en toda clase de teclados que Java conoce. Por favor "
-#~ "use solamente las que corresponden a una tecla real de su teclado. Así "
-#~ "que si su teclado no tiene la tecla 'Copy' no la use (los teclados de PC "
-#~ "no la tienen, los teclados de Sun sí). Igualmente Habrá teclas que "
-#~ "correspondan a un atajo o combinación de teclas (ej: \":\"/dos puntos). "
-#~ "Por favor tampoco utilice éstas, es mejor usar la tecla base ( '.'/Punto "
-#~ "en teclado español, ';'/Punto y coma en teclado americano ....). Si no se "
-#~ "hace de esta manera se producirán conflictos, ya que JOSM no tiene manera "
-#~ "de saber que [Ctrl + shift + . ] y [ Ctrl + : ] es lo mismo en un teclado "
-#~ "español...</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Los atajos de teclado se asignan a las acciones cuando JOSM se inicia. "
-#~ "Por tanto debe <b>reiniciar</b> para que sus cambios tengan efecto.</p>"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Un valor vacío elimina la clave."
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>La última página lista las teclas de modificación que JOSM asignará a "
-#~ "los atajos de teclado automáticamente. Por cada uno de los cuatro tipos "
-#~ "de atajo hay tres alternativas. JOSM intentará usar esas alternativas en "
-#~ "el orden de lista al resolver un conflicto. Si todas las alternativas "
-#~ "están ya asignadas, se inventará el atajo aleatoriamente y lo asignará a "
-#~ "la acción con conflicto."
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "football"
-#~ msgstr "fútbol"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Activando los complementos actualizados"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Activar los complementos actualizados a fallado. Compruebe si JOSM tiene "
-#~ "permiso para escribir sobre los existentes"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "el objeto {0} tiene conflictos"
-#~ msgstr[1] "los objetos {0} tienen conflictos"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Los parámetros se leen en el orden que tienen establecido, así que \n"
-#~ "asegúrese que carga algún dato antes de --seleccionar"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "A Habido problemas con los siguientes complementos:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "El complemento {0} se ha actualizado correctamente. Por favor reinicie "
-#~ "JOSM"
-#~ msgstr[1] ""
-#~ "Los complementos {0} se han actualizado correctamente. Por favor reinicie "
-#~ "JOSM"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Actualizar complementos"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "No se ha podido bajar el complemento: {0} al {1}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "La selección \"{0}\" está siendo usada por la relación \"{1}\" con el rol "
-#~ "{2}.\n"
-#~ "¿Borrar de la relación?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolver conflictos {0} en objetos {1}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Borrar {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Borrar {1} {0}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "La selección \"{0}\" está siendo usada por la relación \"{1}\".\n"
-#~ "¿Borrar de la relación?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relación con conclicto"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividir segmento de vía"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grados minutos segundos"
-
-#~ msgid "hikingmap"
-#~ msgstr "topoguía"
-
-#~ msgid "citymap"
-#~ msgstr "callejero"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "bicyclemap"
-#~ msgstr "mapa ciclable"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Zona Lambert (Francia)"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "El servidor devolvió un error interno. Reduzca el área o reinténtelo más "
-#~ "tarde."
-
-#~ msgid "Error during parse."
-#~ msgstr "Error durante el análisis sintáctico."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Falta el atributo necesario \"{0}\"."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Objeto con id=0 ilegal"
-
-#~ msgid "Accomodation"
-#~ msgstr "Alojamiento"
-
-#~ msgid "Edit Station"
-#~ msgstr "Editar Estación"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Editar nueva relación"
-
-#~ msgid "Create new relation"
-#~ msgstr "Crear nueva relación"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Editar relación #{0}"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Editar propiedades"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etiquetas (un valor nulo borra la etiqueta)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Ocupado por"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Añadir todos los objetos"
-
-#~ msgid "Add Selected"
-#~ msgstr "Añadir seleccionado"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Incluya los pasos previos al error (lo más detalladamente posible)"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Asegúrese de incluir la siguiente información:"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "clique Recargar para refrescar la lista"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "No se puede conectar con el servidor"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Error analizando la respuesta del servidor"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Descargar todas las vías y nodos incompletos de esta relación"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Por favor presente una \"ticket\" en {0}"
-
-#~ msgid "Commit comment"
-#~ msgstr "Envíe comentario"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Revertir el estado de todos los objetos actualmente seleccionados a la "
-#~ "versión escogida de la lista del historial"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Mostrar/Esconder Texto/Iconos"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "¿Realmente quiere borrar toda la capa?"
-
-#~ msgid "name"
-#~ msgstr "nombre"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} formado por la traza {1}"
-#~ msgstr[1] "{0} formado por las trazas {1}"
-
-#~ msgid "Length: "
-#~ msgstr "Longitud: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Rango de tiempo "
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Zona horaria del GPS (diferencia con la foto)"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Imágenes para {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Leer gpx"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "La URL base del servidor OSM (REST API)"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Información del complemento descargada de {0} sitio"
-#~ msgstr[1] "Información del complemento descargada de {0} sitios"
-
-#~ msgid "No plugin information found."
-#~ msgstr "No se ha encontrado información del complemento."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Añadir site-josm.xml o bien Páginas Wiki"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Error al borrar el archivo del complemento: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Ya existe el complemento."
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Error al leer el archivo de información del complemento: {0}"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Todos los complementos instalados están actualizados."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versión {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Actualizar los siguientes complementos:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "¿Descargar los siguientes complementos?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anónimo"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Habilitar servidor proxy"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Descargar los complementos que faltan"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Puerto del servidor proxy"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Usuario del servidor proxy"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Contraseña del servidor proxy"
-
-#~ msgid "Boat"
-#~ msgstr "Barco"
-
-#~ msgid "Goods"
-#~ msgstr "Mercancías"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Puente levadizo"
-
-#~ msgid "Station"
-#~ msgstr "Estación"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Crear marcadores no de audio al leer gpx"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>El pseudo modificador \"desactivar\" desactivará el atajo de teclado "
-#~ "cuando aparezca.</p>"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotar"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "O"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "File not found"
-#~ msgstr "Archivo no encontrado."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Todas la vías están vacías"
-
-#~ msgid "Create a new map."
-#~ msgstr "Crear un nuevo mapa."
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Errores de suma de verificación: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "¡Fallo en la importación NMEA!"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Sentencias desconocidas: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Coordenadas cero: "
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Algunos nodos están (casi) en la línea"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Ocurrió un error al restaurar el archivo de salvaguarda."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Ocurrió un error al guardar."
-
-#~ msgid "Could not back up file."
-#~ msgstr "No se pudo salvaguardar el archivo."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Error interno: no se pueden comprobar las condiciones para ninguna capa. "
-#~ "Por favor comunique esto como fallo."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Arrastre el segmento de la vía para hacer un rectángulo."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Seleccionar, mover y rotar objetos"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "La selección debe consistir solo en vías."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Solo se permiten dos nodos"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Solo hay un nodo seleccionado"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Por favor seleccione vías de ángulos casi rectos para ortogonalizar."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Usar grados decimales."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Valores negativos denotan hemisferio Oeste/Sur"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "No aplicar cambios"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Duplicar las vías seleccionadas"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Duplicar vía"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Crear un duplicado de la vía"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y "
-#~ "desplazamiento"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Unir la capa inmediatamente inferior con la capa selecionada."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Por favor seleccione por lo menos dos nodos para unir."
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Fuente de etiquetas preestablecidas"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Fuentes de etiquetas preestablecidas"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Nodos sin etiquetar y desconectados"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Fotos geoetiquetadas"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Mostrar fotos geoetiquetadas"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Fotos no etiquetadas todavía"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Contraseña o nombre de usuario incorrectos"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "El servidor no soporta conjuntos de cambios"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Abriendo conjunto de cambios..."
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "Navigation"
-#~ msgstr "Navegación"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid "Help / About"
-#~ msgstr "Ayuda / Acerca de..."
-
-#~ msgid "Grid layer:"
-#~ msgstr "Capa de rejilla"
-
-#~ msgid "Grid layout"
-#~ msgstr "Diseño de rejilla"
-
-#~ msgid "help"
-#~ msgstr "ayuda"
-
-#~ msgid "World"
-#~ msgstr "Mundo"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "No se encuentran los argumentos de or"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Missing argument for not."
-#~ msgstr "No se encuentran los argumentos de not"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Se esperaba un cierre de paréntesis."
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Ayuda del componente WMS"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Ajustar la posición de la capa WMS"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Introduzca las coordenadas para el nuevo nodo."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "¿Combinar vías con diferentes relaciones?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere "
-#~ "combinarlas?"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Por favor, elija exactamente tres nodos o una vía con exactamente tres "
-#~ "nodos."
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Sentencias mal formadas: "
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Descargar tesela WMS desde {0}"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Preferencias del componente WMS"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Introduce un nombre y una dirección para el servicio WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "Dirección URL del servicio WMS"
-
-#~ msgid "Copy Default"
-#~ msgstr "Copiar por defecto"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Por favor, seleccione una fila para copiar"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "Dirección URL del servicio WMS (Por defecto)"
-
-#~ msgid "osmarender options"
-#~ msgstr "Opciones de osmarender"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Traza GPX cargada"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Imágenes sin la posición exif"
-
-#~ msgid "Update position for: "
-#~ msgstr "Actualizar posición para: "
-
-#~ msgid "All images"
-#~ msgstr "Todas las imágenes"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>No puedo tomar una imagen de mi receptor GPS <br>¿Puede ayudarme?</"
-#~ "html>"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Yo estoy en la zona horaria de: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Abrir otra foto"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "abrir imágenes con AgPifoJ..."
-
-#~ 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 selección contiene {0} vía. ¿Está seguro que quiere simplificarla?"
-#~ msgstr[1] ""
-#~ "La selección contiene {0} vías. ¿Está seguro que quiere simplificarlas "
-#~ "todas?"
-
-#~ msgid "start"
-#~ msgstr "comenzar"
-
-#~ msgid "end"
-#~ msgstr "fin"
-
-#~ msgid "Request Update"
-#~ msgstr "Solicitar actualización"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Mostrar estado de la tesela"
-
-#~ msgid "error loading metadata"
-#~ msgstr "error al cargar los metadatos"
-
-#~ msgid "image not loaded"
-#~ msgstr "la imagen no se carga"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Reproducir marcador anterior"
-
-#~ msgid "Play next marker."
-#~ msgstr "Reproducir marcador siguiente."
-
-#~ msgid "Jump forward"
-#~ msgstr "Salta hacia delante"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Avance lento"
-
-#~ msgid "Jump back."
-#~ msgstr "Atrás."
-
-#~ msgid "load data from API"
-#~ msgstr "carga de datos desde el API"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importar archivo TCX como traza GPS"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Acciones permitidas"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importar archivo TCX"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Please, introduzca la cadena de caracteres que desea buscar"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "No se ha podido crear nuevos avisos de errores. Resultado: {0}"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "confirmar todas las acciones manuales de control remoto"
-
-#~ msgid "change the selection"
-#~ msgstr "cambiar la selección"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Ajustes para el componente Control Remoto"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Un componente que permite a JOSM ser controlado por otras aplicaciones."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Rueda del ratón o doble click. Mover el mapa: mantenga apretado el "
-#~ "botón derecho del ratón y mueva el ratón. Seleccionar: Click"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Corregir los errores seleccionados"
-
-#~ msgid "requested: {0}"
-#~ msgstr "solicitado:{0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "errore al solicitar actualización"
-
-#~ msgid "Do not show again"
-#~ msgstr "No mostrar de nuevo"
-
-#~ msgid ""
-#~ "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 "
-#~ "complementos antes de comunicar un fallo."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "id del nodo mal formado"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>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>"
-
-#~ msgid ""
-#~ "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 "
-#~ "preestablecida. Ver http://josm.openstreetmap.de/wiki/TaggingPresets (EN) "
-#~ "para ver ayuda."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Imposible leer desde la URL: \"{0}\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Error de análisis sintáctico en URL: \"{0}\""
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "No se puede duplicar una vía sin orden."
-
-#~ msgid "Portcullis"
-#~ msgstr "Rastrillo"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Grupo de predefinidos ''{0}''"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Servidor proxy del host"
-
-#~ msgid "change the viewport"
-#~ msgstr "modificar vista general"
-
-#~ 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."
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "No se pueden leer los resultados de lugares desde el servidor"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "No se encuentra la dirección indexada '{0}'"
-
-#~ 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 ""
-#~ "La(s) vía(s) seleccionadas tienen nodos fuera del área descargada.\n"
-#~ "Esto puede acabar con nodos borrados accidentalmente.\n"
-#~ "¿Está seguro de continuar?"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Fuentes de teselas"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Localización del origen de la rejilla"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id de la imagen rectificada de Metacarta"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorar los errores selecionados la próxima vez."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "{0} nodos duplicados dentro de {1} nodos"
-
-#~ msgid "Footway"
-#~ msgstr "Vía peatonal"
-
-#~ msgid "Cycleway"
-#~ msgstr "Vía ciclable"
-
-#~ msgid "park_and_ride"
-#~ msgstr "estacionamientos Park and Ride"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "El complemento Remote Control siempre escuchará el puerto 8111 en "
-#~ "localhost. El puerto no cambia ya que es referenciado por aplicaciones "
-#~ "externas para comunicarse con el complemento."
-
-#~ msgid "board"
-#~ msgstr "cartel"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "El archivo de preferencias contiene errores. Realizando copia de "
-#~ "seguridad de uno antiguo a {0}."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "¡¡Uno de los archivos seleccionados era nulo!!"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Combinación de teclas duplicada '{0}' - ¡Se ignorará el botón!"
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "La no-vía ''{0}'' en multipolígono"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Advertencia: {0}"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Mostrar Panel de Autor"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Abrir página de usuario en el navegador"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Seleccionar los datos del usuario"
-
-#~ msgid "Open User Page"
-#~ msgstr "Abrir página de usuario"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Error: {0}"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Lo siento, no funciona con usuario anónimos"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Miembro vacío en la relación."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "El complemento {0} parece roto o no se ha podido bajar de forma "
-#~ "automática."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La proyección {0} se ha diseñado \n"
-#~ "solamente para latitudes entre 46.1° y 57°.\n"
-#~ "Use otro sistema de  proyección si no usa\n"
-#~ "un servidor WMS francés.\n"
-#~ "No suba ningún dato después de este mensaje."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Subir a OSM..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Configurar sitios ..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "El archivo de complemento ya está disponible. ¿Quiere descargar la "
-#~ "versión actual borrando el archivo existente?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Editar sendero de montaña exigente"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Sendero de montaña exigente"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Sendero de montaña"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Editar sendero de montaña"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Sendero alpino"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Editar sendero alpino"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Pista de grado 2 (de áridos o zahorra)"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Pista de grado 1 (pavimentada)"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)"
-
-#~ msgid "Track Grade 5"
-#~ msgstr ""
-#~ "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Conservar archivos de copia de seguridad"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Longitud máxima (en metros) para dibujar líneas. Ponga valor '-1' para "
-#~ "dibujarlas todas."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autores: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Capas: {0}"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "No se ha podido conectar con el servidor OSM. Por favor, verifique su "
-#~ "conexión a Internet."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflictos: {0}"
-
-#~ msgid "History of Element"
-#~ msgstr "Histórico del elemento"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "La vía multipoligonal ''{0}'' no está cerrada."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "El estilo de la vía exterior ''{0}'' no coincide."
-
-#~ msgid "Exception occurred"
-#~ msgstr "Ocurrió una excepción"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Abre la ventana de OpenStreetBugs y activa la descarga automática"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANTE: los datos están posicionados\n"
-#~ "lejos de los límites de la Zona Lambert.\n"
-#~ "No suba ningún dato después de este mensaje.\n"
-#~ "Deshaga su última acción, guarde su trabajo\n"
-#~ "y cree una nueva capa en otra zona."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Sincronizar hora con la del receptor GPS"
-
-#~ msgid "Public"
-#~ msgstr "Público"
-
-#~ msgid "standard"
-#~ msgstr "estándar"
-
-#~ msgid "advance"
-#~ msgstr "avanzado"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Editar tienda de bebidas"
-
-#~ msgid "intermedia"
-#~ msgstr "intermedia"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "El sistema de proyección no puede ser leído en las preferencias. Usando "
-#~ "EPSG:4326"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Editar sendero"
-
-#~ msgid "Download List"
-#~ msgstr "Descargar lista"
-
-#~ msgid "Shop"
-#~ msgstr "Concesionario"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Miembros: {0}"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Guardar y salir"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Eliminar todos los objetos seleccionados de la relación"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eliminar seleccionados"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Modificar la lista de servidores WMS mostrados en el menú del componente "
-#~ "WMS \n"
-#~ "(seleccionar de la lista inferior de servidores posibles y pulsar botón "
-#~ "\"añadir\" \n"
-#~ "para añadirlo a la lista superior de servidores mostrados)"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Pila de comandos: {0}"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Eliminar capa"
-
-#~ msgid "near"
-#~ msgstr "próximo a"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Eliminar y descargar"
-
-#~ msgid "Login"
-#~ msgstr "Inicio de sesión"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Descarga de complementos"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Altura max. (en metros)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Anchura max. (en metros)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Longitud max. (en metros)"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Datos con errores. ¿Aún así desea subirlos al servidor?"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Combinaciones incorrectas de etiquetas y/o valores"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Combinar de todos modos"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Resolver conflictos"
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:May</b> - 'May' en cualquier parte del nombre."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objetos con un ID determinado"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Unir de todos modos"
-
-#~ msgid "autozoom"
-#~ msgstr "zoom automático"
-
-#~ msgid "autoload tiles"
-#~ msgstr "Carga automática de teselas"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Zoom automático: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Carga automática de teselas: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max. nivel de zoom: "
-
-#~ msgid "Add a new layer"
-#~ msgstr "Añadir una nueva capa"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Descargando imágenes desde el servidor francés WMS del Catastro"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Zona Lambert"
-
-#~ msgid "Zone"
-#~ msgstr "Zona"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continuar de todos modos"
-
-#~ msgid "No password provided."
-#~ msgstr "Ninguna contraseña facilitada."
-
-#~ msgid "No username provided."
-#~ msgstr "Ningún nombre de usuario facilitado."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Calle Mayor</b> - 'Calle' y 'Mayor' en cualquier clave o valor."
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rotación de la rejilla"
-
-#~ msgid "optician"
-#~ msgstr "Óptica"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Establecer {0}={1} para {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Establecer {0}={1} para {2} {3}"
-
-#~ msgid "Move Down"
-#~ msgstr "Mueve hacia abajo"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor de relación: {0}"
-
-#~ msgid "Move Up"
-#~ msgstr "Mover hacia arriba"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Resolver conflicto"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Colores de puntos y segmentos de trazas según la dispersion de la "
-#~ "precisión (HPOP). Se requiere que su dispositivo de captura registre esa "
-#~ "información."
-
-#~ msgid "Slippy Map"
-#~ msgstr "Mapa desplazable"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "¿Subir estos cambios?"
-
-#~ msgid "Painting problem"
-#~ msgstr "Problema al dibujar"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Esta acción requiere de {0} solicitudes individuales de descargas. ¿Desea "
-#~ "continuar?"
-
-#~ msgid "Update Data"
-#~ msgstr "Actualizar datos"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Ajustar la posición de la capa WMS seleccionada"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "Se encontraron {0} geoetiquetadas."
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Ninguna intersección encontrada. No se han producido cambios."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Se ha seleccionado hacer públicas sus trazas GPS en openstreetmap.org"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "ESTO ES EXPERIMENTAL. Guarde su trabajo y verifíquelo antes de la subirlo "
-#~ "al servidor."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Por favor, seleccione al menos un vial cerrado para ser unido."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" no está cerrado y, por tanto, no se puede unir."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Hay cambios sin guardar. ¿Eliminar la capa de todas formas?"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Remplazar selección con los datos de usuarios"
-
-#~ msgid "Default Values"
-#~ msgstr "Valores por defecto"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectificar id={0}"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Puede añadir, editar y borrar entradas de servicios WMS en la pestaña "
-#~ "Preferencias del componente WMSplugin. Una vez modificado estos cambios "
-#~ "se mostrarán en el menú WMS.\n"
-#~ "\n"
-#~ "También puede hacerlo manualmente en 'Preferencias avanzadas' usando el "
-#~ "siguiente esquema:\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"
-#~ "Ejemplo del formato de una URL completa del servicio WMS para 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"
-#~ "Para el restificador de mapas de Metacarta http://labs.metacarta.com/"
-#~ "rectifier/ únicamente necesita introducir el identificador 'id' que este "
-#~ "servicio le proporciona.\n"
-#~ "Para agregar una imagen de un mapa rectificada mediante esta utilidad de "
-#~ "Metacarta sustituya en esta URL de ejemplo el número 73 por el id que "
-#~ "identifica a su imagen: \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"
-#~ "Nota: Asegúrese que los derechos de autor de la imagen que vaya a "
-#~ "utilizar se adecúan a la licencia de OSM. Si duda, por favor, no la "
-#~ "utilice."
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Se ha producido un error al tratar de hacer coincidir las fotografías con "
-#~ "la traza GPX. Puede ajustarlo regulándolo manualmente para hacer "
-#~ "coincidirlos.\""
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Diferencia horaria de {0} días)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Ajustadas al track GPS {0} de {1} fotografías"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Diferencia temporal entre la traza y las fotografías: {0}m {1}s"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "La traza GPX seleccionada no contiene información temporal. Por favor, "
-#~ "seleccione otra."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Las fotografías no contiene información horaria"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr ""
-#~ "Las fotografías seleccionadas no contienen información sobre la hora en "
-#~ "que fueron tomadas."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Encontrado {0} coincidencias de{1} en la traza GPX {2}"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Zona Lambert {0} en la caché incompatible con la zona Lambert  actual {1}"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Centro de la imágen ráster: {0}"
-
-#~ msgid "sports"
-#~ msgstr "Deportes"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Compruebar el registro de notas."
-
-#~ msgid "Please select some data"
-#~ msgstr "Por favor, seleccione algunos datos"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Por favor seleccione algún usuario en el panel de autor"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Mover objetos arrastrando; Mayúsculas para añadir a la selección (Ctrl "
-#~ "para alternar); Shift-Ctrl para rotar lo seleccionado, o cambiar la "
-#~ "selección"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Analizar si el mapa creado contiene errores en los datos."
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Abrir una capa primero (GPX, OSM, cache)"
-
-#~ msgid "SlippyMap"
-#~ msgstr "Mapa desplazable"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Proyección inválida"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Etiquetado automático de la fuente añadida:"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Editar pista de grado 1 (pavimentada)"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Editar pista de grado 2 (de áridos o zahorra)"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr ""
-#~ "Editar pista de grado 5 (con rodaduras apenas visibles entre la "
-#~ "vegetación)"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Sendero alpino exigente"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Editar sendero de montaña exigente"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Sendero alpino difícil"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Editar sendero alpino difícil"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Editar un puente levadizo"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Editar rastrillo"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Se han producido los siguientes errores durante la descarga masiva:"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Pueblo/ciudad {0} no hallado o disponible en WMS.\n"
-#~ "Por favor verifica su disponibilidad en www.cadastre.gouv.fr"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Cambia la proyección a {0} previamente."
-
-#~ msgid "Edit Airport"
-#~ msgstr "Editar Aeropuerto"
-
-#~ msgid "Map Type"
-#~ msgstr "Tipo de Mapa"
-
-#~ msgid "Board Type"
-#~ msgstr "Tipo de Cartel"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Para activar el componente WMS Catastro cambie\n"
-#~ "la proyección de JOSM a Lambert y reinicie la aplicación"
-
-#~ msgid "Fade background: "
-#~ msgstr "Fondo de pantalla apagado: "
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Editar oficina de información"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:May</b> - sin 'May' en el nombre."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "El componente no pudo ser eliminado. Por favor informe del problema a los "
-#~ "administradores de JOSM."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "El componente {1} requiere a su vex del componente {0} pero no se ha "
-#~ "encontrado"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Cambiar vista a pantalla completa"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Asignar manualmente la zona Lambert (p. ej. para localizaciones entre dos "
-#~ "zonas)"
-
-#~ msgid "Add grid"
-#~ msgstr "Añadir malla"
-
-#~ msgid "Optional"
-#~ msgstr "Opcional"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Ajustes para el complmento SlippyMap"
-
-#~ msgid "Full Screen"
-#~ msgstr "Pantalla completa"
-
-#~ msgid "Start routing"
-#~ msgstr "Iniciar enrutamiento"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Eliminar nodos de ruta"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Clic y arrastrar param over los nodos de ruta"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Clic para añadir nodos de ruta"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Un validador de datos OSM. Verifica y avisa de los posibles errores "
-#~ "existentes en los datos y proporciona correcciones para los comunes. "
-#~ "Integra una corrector ortográfico para los nombres de las etiquetas."
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Muestra imágenes georreferenciadas como fondo en JOSM (servidores WMS, "
-#~ "Yahoo, etc.)"
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Herramientas para trabajar con los autores/usuarios. Selecciona datos del "
-#~ "mapa que pertenecen al usuario seleccionado y abre el navegador con la "
-#~ "página del perfil de autor seleccionada."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Carga directamente archivos TCX en JOSM"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Muestra una imágen OpenLayers de fondo"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simula un clic cuando haces un pequeño y corto arrastre del ratón. Esto "
-#~ "es útil para punteros de tabletas digitalizadoras, cuando tengas "
-#~ "problemas simplemente haz clic en la tableta digitalizadora sin mover el "
-#~ "ratón(general Java - tablet problem).."
-
-#~ msgid "<multiple>"
-#~ msgstr "<multiple>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Fusionar áreas: eliminar las vías cortas"
-
-#~ msgid "Closed Way"
-#~ msgstr "Vía cerrada"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Fusionar área superpuesta consigo misma"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías "
-#~ "con la traza del GPS o importa los metadatos geográficos EXIF de las "
-#~ "fotos."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Archivo caché de la zona Lambert 1 (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Archivo caché de la zona Lambert 3 (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Archivo caché de la zona Lambert 2 (.2)"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Archivo caché de la zona Lambert 4 (.4)"
-
-#~ msgid "Fix relations"
-#~ msgstr "Arreglar relaciones"
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "La principal característica del componente es la posibilidad de eliminar "
-#~ "los puntos de una traza GPX. Se puede utilizar para preparar las trazas "
-#~ "antes subirlas a OSM para, por ejemplo, suprimir partes de la traza poco "
-#~ "interesantes."
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplicado de vías con cierto desplazamiento unas de otras"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A> or <A "
-#~ "HREF=\"{1}\">spanish</A>."
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Seleccione una vía cerrada de al menos cuatro puntos."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Permite al usuario crear diferentes esquemas de color e intercambiar "
-#~ "entre ellos. Simplemente cambia los colores y crear un nuevo esquema. Se "
-#~ "utiliza para cambiar a un fondo blanco con colores semejantes para una "
-#~ "mejor visibilidad con la luz brillante del sol. Ver cuadro de diálogo en "
-#~ "las preferencias de JOSM  y en \"Ajustes del Mapa\" (extraño pero "
-#~ "cierto :-)"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Estraer las huellas de los edificios"
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "División de la zona de descarga:"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Muestra una rejilla del mapa desplazable en JOSM. Puede cargar teselas "
-#~ "desde el mapa desplazable y solicitar actualizaciones."
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr ""
-#~ "Componente para utilizar el servidor WMS del registro de la propiedad del "
-#~ "suelo francés."
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Seleccione tabla de montaje"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Un componente especial para el manejo del servidor WMS del catastro "
-#~ "francés en www.cadastre.gouv.fr<BR><BR>Por favor, lea los Términos y "
-#~ "Condiciones de Uso aquí (en francés):<br><a href=\"http://www.cadastre."
-#~ "gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> http://www."
-#~ "cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-#~ "<BR>antes de subir cualquier dato creado mediante este componente."
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Hito direccional (excursionismo)"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Soporta versiones 0.5 y 0.6 del protocolo, pero el servidor dice que "
-#~ "soporta {0} a {1}"
-
-#~ msgid "Not initialized"
-#~ msgstr "No iniciado"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Versión desconocida: {0}"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr ""
-#~ "Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Longitud máxima (en metros) para dibujar líneas en los archivos locales. "
-#~ "Valor '-1' para dibujar todas las líneas."
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "No se puede leer el valor numérico de la respuesta"
-
-#~ msgid "More details"
-#~ msgstr "Más detalles"
-
-#~ msgid "% of lat:"
-#~ msgstr "% de lat:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% de lon:"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida."
-
-#~ msgid "linked"
-#~ msgstr "enlazado"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La proyección \"{0}\" está diseñada únicamente\n"
-#~ "para latitudes entre 45.7° y 47.9°\n"
-#~ "y longitudes entre 5.7° y 10.6°.\n"
-#~ "Use otro sistema de proyección si no está trabajando\n"
-#~ "con un conjunto de datos relativos a Suiza o Liechtenstein.\n"
-#~ "No suba ningún dato tras haber leido este mensaje."
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "La subida de datos ha fallado por una razón desconocida"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Falta número de versión en los datos OSM"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Valor no válido para el atributo \"version\" en la primitiva OSM con id "
-#~ "{0}, valor {1}"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "La proyección no puede leerse desde las preferencias. Usando Mercartor"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr ""
-#~ "Atributo \"type\" no válido en el miembro {0} de la relación {1}, valor "
-#~ "{2}"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ChangeRelationMemberRole"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Sin nuevos cambios que enviar"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Valor no válido para el atributo \"ref\" de un miembro de la relación "
-#~ "{0}, valor {1}"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Falta el atributo \"version\" en la primitiva OSM con id {0}"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "No se ha podido iniciar la comunicación con el servidor de OSM {0}.\n"
-#~ "Compruebe la URL del servidor en sus preferencias y su conexión a "
-#~ "Internet."
-
-#~ msgid "Uploading"
-#~ msgstr "Subiendo"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Clic 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."
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parámetros incorrecto para el operador de nodos."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Valor incorrecto del operador de ID: {0}. Se esperaba un número."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Valor incorrecto de operador de nodos: {0}. El operador de nodos espera "
-#~ "un número de nodos o un intervalo, por ejemplo nodos:10-20"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Resolver conflictos de versión para {0} {1}"
-
-#~ msgid "changeset"
-#~ msgstr "conjunto de cambios"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "No se puede leer la proyección en las preferencias. Se usa Mercator."
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Ayuda en línea de JOSM"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Mostrar informacion del historial de las vías o nodos de OSM"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">english</A> o <A HREF="
-#~ "\"{1}\">su idioma</A>."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos "
-#~ "previamente enviados tienen historial."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que "
-#~ "quiere unirlos?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "¿Unir nodos con diferentes relaciones?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "No se pueden unir los nodos: Habría que borrar una vía que todavía está "
-#~ "en uso."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Por favor, seleccione una o más vías cerradas de al menos cuatro nodos."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Esta usando la proyección EPSG:4326 la cual puede producir<br> "
-#~ "resultados indeseados para alineaciones rectangulares<br>Cambie de "
-#~ "proyección para evitar este aviso.<br>¿Desea continuar?"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "No se ha podido cambiar el nombre del archivo \"{0}\"."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Sí, deshacer el borrado de ellos también"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, calcelar la operación"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Hay {0} nodos adicionales usados por la vía {1}<br>que están "
-#~ "borrados en el servidor.<br><br>¿Quiere deshacer el borrado de esos nodos "
-#~ "también?</html>"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Deshaciendo borrado de vía..."
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "No hay datos que actualizar. ¿Ha abierto o descargado ya una capa de "
-#~ "datos?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Actualiza la actual capa de datos desde el servidor (re-descargas de "
-#~ "datos)"
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Deshaciando borrado de relación..."
-
-#~ msgid "Update failed"
-#~ msgstr "Actualización fallida"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Fallo al actualizar las primitivas seleccionadas."
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "Retorno de valor inexperado. Obtenido {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitiva borrada en el servidor"
-
-#~ msgid "Selection too big"
-#~ msgstr "Selección demasiado grande"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "No hay primitivas seleccionadas para actualizar"
-
-#~ msgid "Update Selection"
-#~ msgstr "Actualización de selección"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Falta la primitiva"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Sincronizar {0} {1} únicamente"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr ""
-#~ "No se puede encontrar la primitiva con el id {0} en el conjunto de datos "
-#~ "actual"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html> Subida<strong> fallada</ strong>debido a que ha intentado eliminar "
-#~ "una primitiva<br> en el servidor la cual ya está eliminada. <br> El "
-#~ "mensaje de error es: <br> {0} </ html>"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Conflicto detectado"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiva ya eliminada"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Error mientras se comunicaba con el servidor"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Primitivas movidas o borradas"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "no se puede resolver los conflictos pendientes"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Se han producido los siguientes errores durante la descarga masiva:"
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Extender al final de la línea"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "Complemento {0} descargado correctamente. Por favor, reinicie JOSM."
-#~ msgstr[1] ""
-#~ "Complementos {0} descargados correctamente. Por favor, reinicie JOSM."
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "Nombre de usuario OSM (correo-e)"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Aplicar resolución parcial"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Keep mine"
-#~ msgstr "Mantaner lo mío"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Comprobando si falta el primitivo {0}..."
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "¿Deshacer borrado de primitivos dependientes?"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>El primitivo de OSM con ID <strong>{0}</strong> ha sido "
-#~ "borrado<br>en el servidor por otro mapeador.<br><br>Pulse <strong>{1}</"
-#~ "strong> para mantener su primitivo e ignorar el estado de borrado.<br>Se "
-#~ "asignará una nueva ID a su primitivo.<br>Pulse <strong>{2}</strong> para "
-#~ "aceptar el estado en el servidor y borrar su primitivo.<br>Pulse <strong>"
-#~ "{3}</strong> para cancelar.<br>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Borrar lo mío"
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Comprobando si falta el nodo {0}..."
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Hay  <strong>{0}</strong> primitivos <br>seleccionados para "
-#~ "actualización individual. Por favor, reduzca la selección<br>a un máximo "
-#~ "de {1} primitivos.</html>"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr ""
-#~ "Actualiza las primitivas seleccionadas actualmente desde el servidor"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Advertencia: la cabecera errónea \"{0}\" no concuerda con el patrón "
-#~ "esperado \"{1}\""
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Purgando 1 primitiva"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - clave 'type' con el valor exacto 'route'."
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr ""
-#~ "No se ha podido inicializar la API. Por favor, inténtelo de nuevo más "
-#~ "tarde."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Fallo en la inicialización del API"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Una relación de miembros se ha copiado a todas las nuevas vías.\n"
-#~ "Debes verificar y corregir esta cuando sea necesario."
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr ""
-#~ "no se encontró ninguna versión más reciente. El histórico está vacío."
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "ninguna versión más antigua encontrada. El histórico está vacío."
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "el parámetro ''{0}'' no debe ser nulo"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Etiquetas ({0} conflictivas)"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} etiquetas conflictivas pendientes de ser resueltas"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "objeto {0} no encontrado en la lista"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Congelar la lista actual de elementos fusionados"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "el parámetro '{0}' no debe ser nulo"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "no visible (en el servidor)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (en el servidor)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Estado visible:"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Comunicación fallida con el servidor"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Mantener un clon de la versión local"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reiniciar el id a 0"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Mantener mi estado visible"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Sí, reiniciar el id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html> Para mantener su versión local JOSM <br> tiene que restablecer el "
-#~ "identificador de {0} {1} a 0. <br> En la siguiente subida al servidor se "
-#~ "le asignará<br>un nuevo identificador. <br> ¿Está de acuerdo? </ html>"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Mantener su estado visible"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Sí, purgarlo"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Eliminar desde el conjunto de datos"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), faltan {3}. Actualizando {4}: {5} (id: {6})"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Subida a la API de OSM fallida"
-
-#~ msgid "Data Layer"
-#~ msgstr "Capa de datos"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Errores durante la descarga"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Hay {0} primitivas en su conjunto local de datos que<br>pueden "
-#~ "estar borradas en el servidor. Si posteriormente trata de borrarlas "
-#~ "o<br>actualizarlas probablemente el servidor informará de un<br>conflicto."
-#~ "<br><br>Pulse <strong>{1}</strong> para comprobar el estado de estas "
-#~ "primitivas<br>en el servidor-<br>Pulse <strong>{2}</strong> para ignorar."
-#~ "<br></html>"
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Calle Mayor\"</b> - 'Calle Mayor' en cualquier clave o nombre."
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Advertencia: Purgando vía {0}  porque se redujo el número de nodos por "
-#~ "debajo de 2. El actual es {1}"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Eliminar miembro de la relación"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Eliminar \"{0}\" de {1} {2}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Eliminar el miembro en la fila de tabla actual de esta relación"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Eliminar \"{0}\" de {1} ''{2}''"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Nodo en vía fluvial"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Este test comprueba si dos carreteras, vías de tren o vías fluiviales se "
-#~ "cruzan al mismo nivel, sin estar conectadas por algún nodo."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validar la selección actual o el conjunto de datos completado"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Añadir {0} {1}"
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - clave 'type' con cualquier valor. Probar también "
-#~ "<b>*=valor</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Movió más de {0} elementos. Desplazar un gran número de elementos es a "
-#~ "menudo un error.\n"
-#~ "¿Quiere moverlos realmente?"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Cambiar {0} {1}"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Rotar {0} {1}"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Seleccione un nodo de inicio en el extremo de la vía"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Alcanzar una intersección"
-
-#~ msgid "Unnamed Junction"
-#~ msgstr "Intersección sin nombre"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "No existe una primitiva con la versión {0} en este historial"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Zona {0}"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geográfico"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\""
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copiar sus elementos seleccionados al final de la lista de elementos "
-#~ "fusionados"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Copiar sus elementos seleccionados antes del primer elemento seleccionado "
-#~ "en la lista de elementos fusionados"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Copiar mis elementos seleccionados después del primer elemento "
-#~ "seleccionado en la lista de elementos fusionados"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Copiar su elemento seleccionado al inicio de la lista de elementos "
-#~ "fusionados"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "índice de columna inexperado. Obtenido {0}"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Ocurrió un error mientras se comunicaba con el "
-#~ "servidor<br>Detalles: {0}</html>"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Cargando historial para {0} con id {1}"
-
-#~ msgid "History item"
-#~ msgstr "Historial del elemento"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Error cuando se comunicaba con el servidor."
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Ordenar los miembros de la relación seleccionada o toda la lista"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Miembros: {0} (enlazados: {1})"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Historial para {0} {1}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Mostrando el historial de la primitiva seleccionada"
-
-#~ msgid "Used style"
-#~ msgstr "Estilo usado"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copiar predeterminados"
-
-#~ msgid "Icon paths"
-#~ msgstr "Rutas del icono"
-
-#~ msgid "image loading..."
-#~ msgstr "cargando imagen..."
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>El componente OpenStreetBugs usa el antiguo servidor de appspot.com."
-#~ "<br>Un nuevo servidor está disponible en schokokeks.org. <br> ¿Quiere "
-#~ "cambiar al nuevo servidor? (Recomendado)</html>"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "¡Importación de TangoGPS fallida!"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Usar <b>\"</b> para delimitar operadores (por ejemplo si la clave "
-#~ "contiene :)"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - objetos con un determinado número de nodos"
-
-#~ msgid "Load Selection"
-#~ msgstr "Cargar selección"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está "
-#~ "presente"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "eliminando referencia de la vía {0}"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Deshacer borrado de {0} primitivas"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Resolver {0} conflictos de etiquetas en {1} {2}"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "eliminando referencia de la relación {0}"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
-
-#~ msgid "changesets"
-#~ msgstr "conjuntos de cambios"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr ""
-#~ "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\""
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "No se encontró ninguna primitiva con ID {0} y versión {1} en este "
-#~ "conjunto de datos"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr ""
-#~ "No se encontró ninguna primitiva con ID {0} en este conjunto de datos"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID "
-#~ "''{1}''"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr ""
-#~ "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}"
-
-#~ msgid "No data"
-#~ msgstr "Sin datos"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Eliminando miembro de relación {0} {1}"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr ""
-#~ "Eliminar las entradas seleccionadas de la lista de elementos fusionados"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "pa´rametro actual fuera del rango: obtenido {0}"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflicto entre estado visibles sin decidir"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "ajustable {0} no se ha registrado todavía"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "ajustable {0} no se ha registrado todavía. No se puede establecer la "
-#~ "participación en el ajuste sincronizado"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflictos en dato"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "El servidor responde con un error con código {0}"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Se ha encontrado más de una vía \"a\"."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Se ha encontrado más de una vía \"desde\"."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Miembro ''{0}'' borrado en la relación."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Vía ''{0}''  con menos de dos puntos."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Se ha encontrado más de un elemento \"vía\"."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Vía de tipo área sin cerrar"
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Tipo de miembro \"{0}\" desconocido."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "No se ha encontrado ninguna vía \"a\"."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "No se ha encontrado el estilo para la restricción {0}."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "No se ha encontrado ninguna vía \"desde\"."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión "
-#~ "primitiva con la versión inferior {2} no es visible. No se puede hacer "
-#~ "frente a esta incongruencia. Se mantiene mi primitiva. "
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- la versión en ejecución es la {0}"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Abrir archivo (como gps en bruto si es .gpx"
-
-#~ msgid "Set the language."
-#~ msgstr "Establezca el idioma."
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "La capa {0} debe esta en la lista de capas"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "el rol {0} no participa en la pareja de comparación {1}"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Está a punto de borrar nodos fuera del área que se ha descargado.<br>Esto "
-#~ "puede causar problemas ya que otros objetos (que no puede ver) pueden "
-#~ "estar usándolos.<br>¿Esta seguro que quiere borrarlo?"
-
-#~ msgid "image "
-#~ msgstr "imagen "
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "índice fuera de los límites. Obtenido {0}"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Fallo al cargar el historial desde el servidor. Detalles:<br>{0}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, "
-#~ "obtenido \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo, "
-#~ "obtenido \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero (>=0), "
-#~ "obtenido \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo booleano, "
-#~ "obtenido \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo "
-#~ "(>=0), obtenido \"{1}\""
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "atributo \"{0}\" obligatorio perdido"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo "
-#~ "OsmPrimitiveType, obtenido \"{1}\""
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copiar mis elementos seleccionados al final de la lista de elementos "
-#~ "fusionados"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Subir los elementos seleccionados una posición"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Copiar mis elementos seleccionados antes del primer elemento seleccionado "
-#~ "en la lista de elementos fusionados"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Pulsar <strong>{0}</strong> para terminar la fusión de mis entradas "
-#~ "y las suyas</html>"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas "
-#~ "y las suyas</html>"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Bajar las entradas seleccionadas una posición"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Los nodos fusionados aún no están congelados. No se puede construir la "
-#~ "orden de resolución."
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Descargando referencias desde OSM..."
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Referencias descargadas...."
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "el parametro \"{0}\" no debe ser nulo"
-
-#~ msgid "Conflict created"
-#~ msgstr "Conflicto creado"
-
-#~ msgid "Linked"
-#~ msgstr "Vinculado"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "¿Deshacer el borrado de los nodos adicionales?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Hay {0} primitivos adicionales a los que se refiere la relación {1}"
-#~ "<br>que están borrados en el servidor.<br><br>¿Quiere deshacer también el "
-#~ "borrado de los primitivos?</html>"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Eliminar físicamente del conjunto de datos locales"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflictos durante la descarga"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>No puede leerse el archivo ''{0}''. El error es: <br>{1}</html>"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "No existe alctualmente ningua capa WMS que ajustar."
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>No se ha podido grabar el marcador.<br>{0}</html>"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>No se ha podido leer los marcadores.<br>{0}</html>"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Seleccionar capa WMS"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Por favor, selecciona la capa WMS a ajustar."
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Fijar coordenada Lambert"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "subir todos los cambios en una petición"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Permitir subir todos los cambios en una petición, no permitir usar una "
-#~ "petición por cambio sencillo"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "No encontró sencillo id{0} en el conjunto de datos actual"
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Advertencia: fracasó poner un diálogo siempre al frente. La excepción fue:"
-#~ "{0}"
-
-#~ msgid "File could not be found."
-#~ msgstr "El archivo no se encuentra."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "ADVERTENCIA: el formato inesperado de API base URL. Re dirección a la "
-#~ "página de historia para OSM primitivo probablemente fallará . Los API "
-#~ "base URL es: \"{0}\""
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "ADVERTENCIA: lanzamiento de las ventanas del navegador por primera vez "
-#~ "{0} de {1} solo seleccionados primitivos"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "La longitud del valor para la etiqueta \"{0}\" en la primitiva {1} excede "
-#~ "la máxima longitud permitida {2}. Los valores de longitud son {3}."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "El número de modificaciones actuales supera el máximo de modificaciones, "
-#~ "el actual es {0}, el máximo es {1}"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Advertencia:  automáticamente truncando el valor de la etiqueta \"{0}\" "
-#~ "en la primitiva suprimida {1}"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr ""
-#~ "El complemento llamado {0} no está disponible. Omitir actualización."
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "No se puede buscar porque no hay datos cargados."
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
-
-#~ msgid ""
-#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "Hay cambios singrabar en la capa ''{0}''. ¿Eliminar la capa de todas "
-#~ "formas?"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "¿Está seguro que quiere eliminar la capa ''{0}''?"
-
-#~ msgid "Confirmation"
-#~ msgstr "Confirmación"
-
-#~ msgid "Delete all"
-#~ msgstr "Borrar todo"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} objeto para modificar:"
-#~ msgstr[1] "{0} objetos para modificar:"
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Error al inicializar las preferencias.<br>El directorio de las "
-#~ "preferencias ''{0}'' no es un directorio.</html>"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "nota: Para algunas tareas, JOSM necesita mucha memoria. Puede ser "
-#~ "necesario el añadir la siguiente \n"
-#~ "      opción de Java para incrementar el tamaño máximo de la memoria "
-#~ "utilizada."
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "parámetro ''{0}'' no debe estar vacío"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>Fallo al crear una URL porque la codificación ''{0}'' <br>no existe "
-#~ "en este sistema.</html>"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Cerrar el conjunto de cambios actual..."
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Usar un nuevo conjunto de cambio y dejarlo abierto"
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Actualmente no hay un conjunto cambios abierto."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Cerrar el actual conjunto de cambios"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "a {0} primitiva"
-#~ msgstr[1] "a {0} primitivas"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr ""
-#~ "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Activar los valores predefinidos por defecto"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Ha ocurrido una excepción imprevista.\n"
-#~ "\n"
-#~ "Esto es siempre un error de código. Si usted esta ejecutando la última\n"
-#~ "versión de JOSM, por favor, considere enviar un informe de error."
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WML layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>La URL base<br>''{0}''<br>para esta capa WML no finaliza con un "
-#~ "''&'' ni con un ''?''.<br>Esto puede dar lugar a una solicitud WMS no "
-#~ "válida. Debes comprobar la<br>configuración de tus preferencias.<br>"
-#~ "¿Quieres descargar las teselas WMS de todos modos?"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Existen cambios sin guardar en la capa {0}. ¿Desea descartar los cambios "
-#~ "y continuar?"
-#~ msgstr[1] ""
-#~ "Existen cambios sin guardar en las capas {0}. ¿Desea descartar los "
-#~ "cambios y continuar?"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>No se puede leer el archivo ''{0}''.<br> El error es: <br>{1}</html>"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Resolver conflictos de versión para el nodo {0}"
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "una proimitiva con id=0 no puede ser invisible"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Grabar y borrar"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "AVISO: la capa ''{0}'' ya no existe. No se puede eliminar el conflicto "
-#~ "para la primitiva \"{1}''"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Rueda del ratón, doble clic or Ctrl + Up/Down <b>Mover mapa:"
-#~ "</b> Mantenga el botón derecho pulsado y mueva el ratón o las teclas de "
-#~ "dirección. <b>Seleccionar:</b> Clic."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Existen conflictos sin resolver en la capa ''{0}''.<br>Has de "
-#~ "corregirlos primero.</html>"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Preparando primitivas para subir"
-
-#~ msgid "white"
-#~ msgstr "blanco"
-
-#~ msgid "blue"
-#~ msgstr "azul"
-
-#~ msgid "red"
-#~ msgstr "red"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "No se puede añadir nodo {0} a la vía incompleta {1}"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Por favor, decida que valor desea mantener"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr ""
-#~ "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A HREF="
-#~ "\"{1}\">su idioma</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está "
-#~ "presente"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr ""
-#~ "No se encontró ninguna primitiva con ID {0} en este conjunto de datos"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A> or <A "
-#~ "HREF=\"{1}\">spanish</A>."
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copiar la/s seleccionada/s por defecto"
-
-#~ msgid "Man-Made"
-#~ msgstr "Artificial"
-
-#~ msgid "Travel"
-#~ msgstr "Turismo"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "el parámetro ''{0}'' no debe ser nulo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "Retorno de valor inexperado. Obtenido {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "una proimitiva con id=0 no puede ser invisible"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\""
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "No existe una primitiva con la versión {0} en este historial"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "ninguna versión más antigua encontrada. El histórico está vacío."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr ""
-#~ "no se encontró ninguna versión más reciente. El histórico está vacío."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID "
-#~ "''{1}''"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "pa´rametro actual fuera del rango: obtenido {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Los nodos fusionados aún no están congelados. No se puede construir la "
-#~ "orden de resolución."
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "índice de columna inexperado. Obtenido {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parámetro ''{0}'' no debe estar vacío"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "índice fuera de los límites. Obtenido {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Mostrando el historial de la primitiva seleccionada"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "No se pudo leer \"{0}\""
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, "
-#~ "obtenido \"{1}\""
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "valor ilegal para al atributo obligatorio \"{0}\" de tipo entero (>=0), "
-#~ "obtenido \"{1}\""
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "No se ha podido conectar con el servidor OSM. Por favor, verifique su "
-#~ "conexión a Internet."
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Por favor, introduce una cadena de caracteres como filtro"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "No se ha encontrado nada en la selección búscando por ''{0}''"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\".<br>"
-#~ "¿Eliminar de la relación?</html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>La capa ''{0}'' ya tiene un conflicto con la primitiva <br>''{1}''."
-#~ "<br>Este conflicto no puede ser añadido.</html>"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Resolver conflictos de versión para la relación {0}"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Aviso: Error al inicializar las preferencias. El directorio de las "
-#~ "preferencias ''{0}'' no es un directorio."
-
-#~ msgid "Text"
-#~ msgstr "Texto"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Atención: La capa ''{0}'' ya no existe. No se puede eliminar el conflicto "
-#~ "para la primitiva ''{1}''."
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>El envío de datos <strong>falló</strong> debido a que se ha "
-#~ "empleado<br>un conjunto de cambios {0} que se cerró previamente ({1})."
-#~ "<br>Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o "
-#~ "uno existente y abierto.</html>"
-
-#~ msgid "Bridleway"
-#~ msgstr "Vía ecuestre"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Resolver conflictos de versión para la vía {0}"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
-#~ "excepción fue: {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Se esperaba un ID >=0. Obtenido {0}"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "brown"
-#~ msgstr "marrón"
-
-#~ msgid "black"
-#~ msgstr "negro"
-
-#~ msgid "Bikes"
-#~ msgstr "Bicicletas"
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr ""
-#~ "Agrupar las entradas comunes de \tinterpolación de direcciones en un "
-#~ "único diálogo,"
-
-#~ msgid "Processing {0}"
-#~ msgstr "Procesando {0}"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Este test comprueba que no existen vías con las mismas etiquetas y nodos "
-#~ "con iguales coordenadas."
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"."
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la "
-#~ "función {2}.<br>¿Eliminar de la relación?</html>"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Función ''{0}'' desconocida."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Aplicar también a los niños"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Fallo al abrir una conexión con el servidor "
-#~ "remoto<br>''{0}''<br>por razones de seguridad. Esto sucede normalmente "
-#~ "porque está funcionando en una miniaplicacióin <br> y no lo ha cargado "
-#~ "desde ''{1}''.</html>"
-
-#~ msgid "No, don't apply"
-#~ msgstr "No, no lo apliques"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "traza"
-#~ msgstr[1] "trazas"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "{0} objetos eliminados"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Eliminando referencia de la relación {0}"
-
-#~ msgid "minor_line"
-#~ msgstr "baja tensión"
-
-#~ msgid "underwater"
-#~ msgstr "sumergido"
-
-#~ msgid "tower"
-#~ msgstr "torre"
-
-#~ msgid "Relation: from {0} to {1} via {2}"
-#~ msgstr "Relación: desde {0} a {1} a través de {2}"
-
-#~ msgid "create new objects"
-#~ msgstr "crear nuevos objetos"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "El componente no puede ser eliminado. Probablemente ya estaba desabilitado"
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr ""
-#~ "Error: fallo al añadir credenciales de autentificación a la conexión."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "No se puede deshacer la operación \"{0}\" porque la capa \"{1}\"  ya no "
-#~ "está presente."
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. "
-#~ "Saltando esta primitiva e intentando  volver a enviar los cambios."
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Está a punto de lanzar {0} ventanas de navegador. <br> Esto puede "
-#~ "abarrotar la pantalla con ventanas y llevar bastante tiempo en terminar."
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr ""
-#~ "El conjunto de cambios actual es nulo. Los datos no se pueden subir."
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Subir datos a un conjunto de cambios abierto"
-
-#~ msgid "Update selections"
-#~ msgstr "Actualizar selecciones"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr ""
-#~ "Actualizar los objetos de la capa de datos actual desde el servidor."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Subir todos los cambios en la capa de datos actuales a el servidor de OSM"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Abrir un nuevo conjunto de cambios"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Usar un nuevo conjunto de cambios"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr ""
-#~ "No se ha encontrado ningún objeto con ID {0} en el conjunto de datos "
-#~ "actual"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Por defecto (vea el texto emergente para información más detallada)"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr ""
-#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición "
-#~ "{0}."
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Añadidos {0} objetos"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Datu kargak <strong>huts egin du</strong>.<br>{0}</html>"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Oinarrizkoa eguneratzen"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Requreido ID > 0, obtenido {0}"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} componente actualizado correctamente."
-#~ msgstr[1] "{0} componentes actualizados correctamente."
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Estilos disponibles (desde {0})"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Número de parámetros erróneos para las etiquetas de operador"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "El párametro ''{0}'' no debe estar vacío"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Valor doble ''{0}'' ilegal"
-
-#~ msgid "gray"
-#~ msgstr "gris"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Crea multipolígonos mediante un solo clic, mucho más fácil que la forma "
-#~ "estándar con el editor de relaciones."
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Nivel mínimo de zoom: "
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Debes seleccionar al menos dos vías"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "El multipolígono debe consistir únicamente de vías cerradas."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Por favor, reinicia JOSM"
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
-#~ msgstr ""
-#~ "Acaba de actualizar su JOSM.\n"
-#~ "Para evitar problemas también debería actualizar los componentes "
-#~ "instalados.\n"
-#~ "¿Desea actualizar los componentes ahora?"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflicto sigue sin resolverse. <br> <br> Por favor, abra el cuadro "
-#~ "de dialogo de Conflictos y resuélvalo manualmente."
-#~ msgstr[1] ""
-#~ "{0} conflicto2 siguen sin resolverse. <br> <br> Por favor, abra el cuadro "
-#~ "de dialogo de Conflictos y resuélvalos manualmente."
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Subiendo {0} objetos..."
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Valor incorrecto del operador tags: {0}. El operado tags espera un numero "
-#~ "o rango de etiquetas, por ejemplo tags:1 o tags:2-5"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Esperada una matriz de longitud 4, obtenida {0}"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr ""
-#~ "No se puede agregar la primitiva {0} al conjunto de datos porque ya está "
-#~ "incluida"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -48032,1492 +44553,123 @@
 #~ "segura."
 
+#~ msgid "Always update withouth asking"
+#~ msgstr "Actualizar siempre sin preguntar"
+
 #~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "No se puede comparar la primitiva con ID \"{0}\" con la primitiva con ID "
-#~ "\"{1}\""
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}"
-
-#~ msgid "line"
-#~ msgstr "alta tensión"
+#~ "<html>Alternativamente puede introducir una <strong>dirección de tesela</"
+#~ "strong> para una tesela en el formato <i>nivel_de_zoom/x/y</i>, por "
+#~ "ejemplo <i>15/256/223</i>.Las direcciones de tesela en el formato <i>zoom,"
+#~ "x,y</i> o <i>zoom;x;y</i> también son válidas.</html>"
 
 #~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "<html>ADVERTENCIA: La clave es almacena en texto plano en el archivo de "
-#~ "preferencias.<br> La contraseña es transferida en texto plano al "
-#~ "servidor, codificada en la URL.<br><b>No utilice claves valiosas.</b></"
-#~ "html>"
-
-#~ msgid "Active styles"
-#~ msgstr "Estilos activos"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Por favor, una latitud válida en el rango -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Por favor, introduce una latitud válida en el rango-180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Por favor, introduce una latitud válida en el rango -90..90"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Subir al servidor todos los cambios en una sola solicitud"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Introduzca una longitud en el rango -180..180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Cerrar el diálogo, no crear un nuevo nodo"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Vista a pantalla completa"
+#~ "Atención: se ignora la excepción debido a que la tarea fue cancelada. La "
+#~ "excepción era: {0}"
 
 #~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Una subida y/o una operación de guardado de una de las capas con "
+#~ "modificaciones<br>ha sido cancelada o ha fallado.</html>"
+#~ msgstr[1] ""
+#~ "<html>Hay subidas y/o operaciones de {0} capas con modificaciones<br>que "
+#~ "han sido canceladas o han fallado.</html>"
+
+#~ msgid ""
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Varias utilidades que hacen la vida en JOSM mucho más fácil: por ejemplo, "
-#~ "simplificar un vía, unir áreas, moverse a un determinada posición, etc."
+#~ "<html>Se requiere <strong>varios conjuntos de cambios</strong>para subir "
+#~ "{0} objetos. ¿Qué estrategia desea emplear?</html>"
+
+#~ msgid "Both"
+#~ msgstr "Ambos"
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Añadir todas las primitivas seleccionadas al conjunto de datos actual "
-#~ "antes del primer miembro seleccionado"
+#~ "Ocurrió un error al interpretar el fichero gpx {0}. Sólo parte del "
+#~ "fichero estará disponible"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr ""
+#~ "El prólogo del documento OsmChange no se ha escrito aún. Por favor "
+#~ "escriba uno."
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Añadir todas las primitivas seleccionadas al conjunto de datos actual "
-#~ "antes del último miembro seleccionado"
+#~ "Hace falta atributos obligatorios en el elemento \"bounds\". Se obtuvo "
+#~ "minlon=\"{0}\", minlat=\"{1}\", maxlon=\"{3}\", maxlat=\"{4}\", origin="
+#~ "\"{5}\""
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Abrir un editor para la restricción de giro seleccionada"
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Añadir todas las primitivas seleccionadas al conjunto de datos actual "
-#~ "antes del primer miembro"
+#~ "Plugin cadestre-fr usado tradicionalmente para detectar el acceso directo "
+#~ "del teclado F11\n"
+#~ "que esta asignado en este momento para el cambio a pantalla completa\n"
+#~ "Desea restaurar la tecla F11 para la ejectuar la acción TOMAR?"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Permite filtrar las trazas GPS innecesarias"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Fijar dirección"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "Se encontró un fichero de calibración asociado a la imagen:"
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "Añadir todas las primitivas seleccionadas al conjunto de datos actual "
-#~ "antes del último miembro"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Seleccionar primitivas presentadas por este usuario"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Seleccionar primitivas para la relación de miembros señalada"
+#~ "(elija \"{0}\" para si/no/preguntar en las preferencias\n"
+#~ "para controlar la carga automática de los archivos\n"
+#~ "de calibración)"
 
 #~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "Seleccionar los miembros de la relación que se refieren a las primitivas "
-#~ "de la selección actual"
+#~ "Elija \"{0}\" de si/no/preguntar en las preferencias\n"
+#~ "para controlar la carga automática de los archivos\n"
+#~ "de calibración."
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
+#~ msgstr "De ahora en adelante los archivos cal se cargarán automáticamente."
 
 #~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
+#~ "configurable because it is referenced by external applications talking to "
+#~ "JOSM."
 #~ msgstr ""
-#~ "Seleccionar los miembros de la relación que se refieren a {0} primitivas "
-#~ "de la selección actual"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>Las relaciones {0} son cíclicas (cada una se refiere a la otra)"
-#~ "<br>JOSM no puede subirlas al servidor. Por favor: edite las relaciones y "
-#~ "elimine la dependencia cíclica.</html>"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "El servidor responde con el código de respuesta 404, reintentando con una "
-#~ "petición individual para cada primitiva."
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>La URL base<br>''{0}''<br>para esta capa WMS no finaliza con un "
-#~ "''&'' ni con un ''?''.<br>Esto puede dar lugar a una solicitud WMS no "
-#~ "válida. Debe comprobar la<br>configuración de sus preferencias.<br>"
-#~ "¿Quiere descargar las teselas WMS de todos modos?"
-
-#~ msgid "Motorboat"
-#~ msgstr "Embarcación a motor"
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Área de descarga actual</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Advertencia: La URL ''{0}'' del servicio WMS no finaliza con '&'  o '?'."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "El enlace o ID introducido no coincide con el servicio seleccionado. Por "
-#~ "favor, inténtelo de nuevo."
-
-#~ msgid " is not a number"
-#~ msgstr " no es un número"
-
-#~ msgid " must be greater than 0"
-#~ msgstr " debe ser mayor que 0"
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html> Autentificación en el proxy HTTP ''{0}'' fallida. Por favor, "
-#~ "introduzca un nombre de usuario y una contraseña válida.</html>"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Configuración del proxy"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Descargar primitivas referenciando a una de la primitivas seleccionadas"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Esta prueba encuentra objetos en varios idiomas en los cuales el atributo "
-#~ "'name' no coincide con algunos atributos 'name: *'  o con una composición "
-#~ "de los atributos 'nombre: *' , por ejemplo, España- Espanya- Spain."
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>No se pudo abrir la carpeta.<br>¡Seleccione un archivo!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Abriendo {0} archivos..."
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Falta el paréntesis derecho"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Rueda del ratón, doble clic o Ctrl + Arriba/Abajo <b>Mover "
-#~ "el mapa:</b> Mantener el botón derecho pulsado y desplazar el ratón o "
-#~ "usar las teclas de cursor.<b> Seleccionar: </b> Mantener pulsado el botón "
-#~ "izquierdo del ratón para dibujar un marco de selección."
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Arrastre un segmento de vía para hacer un rectángulo. Ctrl+arrastrar para "
-#~ "mover un segmento a lo largo de su normal."
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valor incorrecto del operador de la versión: {0}. Se esperaba un número."
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Error: Valor doble ilegal ''{0}'' en la línea ''{1}'' en la lista de "
-#~ "marcapáginas del servidor"
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Atnción: el archivo de revisión '/REVISION' no existe."
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr ""
-#~ "Error: Línea ''{0}'' inesperada en la lista de marcapáginas del servidor"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM borrará la primitiva local con id {0}<br>del dataset.<br>¿Está "
-#~ "de acuerdo?</html>"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parametro ''{0}'' > 0.0 esperado, sumnistrado {1}"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Se esperaban cuatro dobles en la cadena, suministrados {0}"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Activar el indicador 'modificado' para el camino {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Activar el indicador 'modificado' para la relación {0}"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Activar el indicador 'modificado' para el nodo {0}"
-
-#~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
-#~ msgstr ""
-#~ "No se puede asignar un Id de conjunto de cambios >0 a la nueva primitiva. "
-#~ "El valor del Id del conjunto de cambios es {0}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Parámetro \"{0}\" >= 0 esperado, suministrado {1}"
-
-#~ msgid ""
-#~ "Can't merge because either of the participating primitives is new and the "
-#~ "other is not"
-#~ msgstr ""
-#~ "No se puede combinar porque una de las primitivas es nueva y la otra no."
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "No se puede aplicar la colección de etiquetas a la primitiva, ya que "
-#~ "existen claves con múltiples valores."
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "No se pueden combinar primitivas con diferentes ids. Una tiene id {0}, la "
-#~ "otra {1}"
-
-#~ msgid ""
-#~ "Parameters --download, --downloadgps and --selection are processed in "
-#~ "this order."
-#~ msgstr ""
-#~ "Los parámetros --download, --downloadgps y --selection se procesan en "
-#~ "este orden."
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Francia)"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "El conjunto de atributos no incluye el valor seleccionado \"{0}\"."
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>JOSM está funcionando con un usuario anónimo. No puede descargar "
-#~ "<br>sus modificaciones del servidor OSM sinó se introduce un nombre de "
-#~ "usuario<br>en las preferencias de JOSM.</html>"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Abierto"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Cerrado"
-
-#~ msgid ""
-#~ "<html>The selected object isn''t available in the current<br>edit layer "
-#~ "''{0}''.</html>"
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer ''{0}''.</html>"
-#~ msgstr[0] ""
-#~ "<html>El objeto seleccionado no está disponible en la<br>capa de edición "
-#~ "actual ''{0}''.</html>"
-#~ msgstr[1] ""
-#~ "<html>Ninguno de los objetos seleccionados está disponible<br>en la capa "
-#~ "de edición actual ''{0}''.</html>"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Descarga y muestra el histórico de las primitivas seleccionadas"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr ""
-#~ "Ajusta la visualización de las primitivas correspondientes en la capa de "
-#~ "datos actual"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Introduzca un ID de modificación"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Ajusta la visualización en la capa de datos actual a las primitivas "
-#~ "contenidas en la modificación"
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr ""
-#~ "El valor actual no es un identificador de modificación válido. Introduzca "
-#~ "un valor entero > 0"
-
-#~ msgid "Can''t restrict the changeset query to the user name ''{0}''"
-#~ msgstr ""
-#~ "No se puede restringir la consulta sobre modificaciones al nombre de "
-#~ "usuario ''{0}''"
-
-#~ msgid ""
-#~ "Can't restrict changeset query to the current user because the current "
-#~ "user is anonymous"
-#~ msgstr ""
-#~ "No se puede restringir la consulta sobre modificaciones al usuario actual "
-#~ "porque es anónimo"
-
-#~ msgid "Current value ''{0}'' for user ID isn''t valid"
-#~ msgstr "El valor actual ''{0}'' para el ID de usuario no es válido"
-
-#~ msgid ""
-#~ "Can't build changeset query with time based restrictions. Input isn't "
-#~ "valid."
-#~ msgstr ""
-#~ "No se puede contruir la consulta con las restricciones basadas en tiempo. "
-#~ "La entrada no es válida."
-
-#~ msgid ""
-#~ "The current value isn't a valid user ID. Please enter an integer value > 0"
-#~ msgstr ""
-#~ "El valor actual no es un ID de usuario válido. Introduzca un valor entero "
-#~ "> 0"
-
-#~ msgid ""
-#~ "<html>The  current value isn't a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr ""
-#~ "<html>El valor actual no es un nombre de usuario válido.<br>Introduzca un "
-#~ "nombre de usuario no vacío.</html>"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Activar para restringir la consulta a las modificaciones propias."
-#~ "<br>Desactivar para incluir todas las modificaciones en la consulta.</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Can't restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "No se puede restringir la consulta de modificaciones a la ventana de "
-#~ "selección especificada. La entrada es inválida"
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valor incorrecto para el operador de modificaciones. {0}. Se esperaba un "
-#~ "número."
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Para mantener su versión local, JOSM<br>tiene que poner a 0 el ID "
-#~ "de los objetos {0} to 0.<br>En la siguiente subida, el servidor asignará "
-#~ "una nueva ID.<br> ¿Continuar? </html>"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "Se esperaba un valor entero > 0 para el parámetro ''{0}'', valor recibido "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>La relación hijo<br>{0}<br>está borrada en el servidor. No se puede "
-#~ "cargar.</html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>La capa ''{0}'' tiene un conflicto con la primitiva <br>''{1}''."
-#~ "<br>Es necesario resolver el conflicto antes de continuar.</html>"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>Esta relación se ha modificado fuera del editor.<br>No se pueden "
-#~ "aplicar los cambios y continuar editando.<br><br>¿Quiere crear un "
-#~ "conflicto y cerrar el editor?</html>"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr ""
-#~ "Aviso: La excepción se ignora, porque la tarea se ha cancelado. La "
-#~ "excepción era: "
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "La cadena ''{0}'' no es un valor doble válido."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "La vía interior del multipolígono está fuera"
-
-#~ msgid "The plugin file ''{0}'' doesn't include a Manifest."
-#~ msgstr "El archivo del componente ''{0}'' no incluye un manifiesto."
-
-#~ msgid ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-#~ msgstr ""
-#~ "Advertencia: no se puedo instalar el componente descargado ''{0}''. "
-#~ "Omitiendo la instalación. JOSM cargará aún la versión obsoleta del "
-#~ "componente."
-
-#~ msgid ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-#~ msgstr ""
-#~ "Debería actualizar sus componentes. Si no existe ninguna ayuda, por favor "
-#~ "un informe del error en nuestro bugtracker través de este enlace:"
-
-#~ msgid ""
-#~ "Please open the Preference Dialog after JOSM has started and try to "
-#~ "update them manually."
-#~ msgstr ""
-#~ "Por favor abra el dialogo de Preferencias después de que JOSM de haya "
-#~ "iniciado e intente actualizarlos manualmente."
-
-#~ msgid "Removing umaintained plugins..."
-#~ msgstr "Eliminando componentes sin mantenimiento..."
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Añadir un nombre de archivo o una URL de un estilo activo"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Comentario de subida no válido"
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "Por favor, introduzca la contraseña de su cuenta de OSM"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" no está cerrado y, por tanto, no se puede unir."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>La capa ''{0}'' ya tiene un conflicto con la primitiva <br>''{1}''."
-#~ "<br>Este conflicto no puede ser añadido.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Atención: La capa ''{0}'' ya no existe. No se puede eliminar el conflicto "
-#~ "para la primitiva ''{1}''."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "senda alpina exigente"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "senda alpina dificil"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "senda de montaña"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "senda de montaña exigente"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "senda alpina"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>No se pudo abrir el directorio.<br>Por favor, seleccione un archivo!"
-#~ "</html>"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr ""
-#~ "Mover los nodos de forma que todos los ángulos sean de 90 y 270 grados"
-
-#~ msgid "Download Object"
-#~ msgstr "Descargar objeto"
-
-#~ msgid "Download Object..."
-#~ msgstr "Descargar objeto..."
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Falta de combinación de destino para el objeto con el ID {0}"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Objeto con el ID {0} y version {1} es visible atravez de la fuente del "
-#~ "objeto con version anterior {2} no es visible. No podemos manejar esta "
-#~ "inconsistencia. Mantengo el objeto. "
-
-#~ msgid "any substance"
-#~ msgstr "cualquier sustancia"
-
-#~ msgid "overground"
-#~ msgstr "en superficie"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Restaurar {0} primitiva"
-#~ msgstr[1] "Restaurar {0} primitivas"
-
-#~ msgid "tagged"
-#~ msgstr "etiquetado"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Advertencia: El componente turnrestrictions sustituye a la acción "
-#~ "existente ''{0}'' tras el acceso directo ''{1}'' por la acción ''{2}''"
-
-#~ msgid "Grid"
-#~ msgstr "Cuadrícula"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "Sistema geodésico UTM20 Norte"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "La unión de las primitivas borradas ha fallado"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Las siguientes primitivas no pueden ser copiadas a la primitiva "
-#~ "destino<br> porque han sido eliminadas en el conjunto de datos de destino:"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Hay {0} nodo adicional usado pur la vía {1}<br>que ha sido eliminada en "
-#~ "el servidor.<br><br>¿Quiere que este nodo vuelva a existir?"
-#~ msgstr[1] ""
-#~ "Hay {0} nodos adicionales usados por la vía {1}<br>que ha sido eliminada "
-#~ "en el servidor.<br><br> ¿Quiere que estos nodos vuelvan a existir?"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Esto equivale a borrar los roles de esas primitivas."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Haga click para descargar el área actualmente seleccionada"
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Filtrar ocultos: {0} Desactivados: {0}"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Miembros múltiples referenciando a la misma primitiva"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Elimina todos los miembros que se refieran a una de las primitivas "
-#~ "seleccionadas"
-
-#~ msgid "GPS point"
-#~ msgstr "Punto GPS"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>La relación hijo <br>{0}<br>se ha borrado del servidor. No se puede "
-#~ "cargar"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Introduzca un comentario para la subida (mínimo 3 caracteres)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Introduzca un comentario para la subida de este set de cambios (mín. 3 "
-#~ "caracteres)"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Introduzca su usuario y contraseña de OSM. La contraseña <strong>no</"
-#~ "strong> se guardará en texto claro en las preferencias y se enviará al "
-#~ "servidor de OSM <strong>sólo una vez</strong>. Las siguientes subidas de "
-#~ "datos no usarán más su contraseña."
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Hay {0} primitiva adicional referida en la relación a {1}<br>la cual está "
-#~ "borrada en el servidor.<br><br>¿Desea recuperarla también?"
-#~ msgstr[1] ""
-#~ "Hay {0} primitivas adicionales referidas en la relación a {1}<br>las "
-#~ "cuales están borradas en el servidor.<br><br>¿Desea recuperarlas también?"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Para mantener su versión local JOSM<br> tiene que restablecer la ID "
-#~ "de la primitiva {0} a 0.<br>En la próxima subida el servidor le "
-#~ "asignará<br>una ID nueva.<br>¿Está de acuerdo?</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "Precaución: formato inesperado de la URL de la base API. La redirección "
-#~ "hacia la página para información o historial para OSM primitivo "
-#~ "probablemente falle. La URL de la base API es:\"{0}\""
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "ID especificada no válida. No se puede descargar el objeto."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Cambiar a ver pantalla completa"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Hasta dos áreas pueden ser unidas por el momento."
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Fusionar primitivos seleccionados actualmente en otra capa"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Los datos copiados contienen primitivos incompletos. Al pegar se borrarán "
-#~ "los primitivos incompletos. ¿Desea pegar los datos sin los primitivos "
-#~ "incompletos?"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Se requiere una vía OSM con el rol <tt>to</tt> en una restricción de giro."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Se requiere una vía OSM con el rol <tt>from</tt> en una restricción de "
-#~ "giro."
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Añadir una vía OSM con el rol \"from\""
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Añadir una vía OSM con el rol \"to\""
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Esta relación ya posee uno o más miembros referidos a<br>la "
-#~ "primitiva ''{0}''<br><br>¿Desea realmente añadir otro miembro relacionado?"
-#~ "</html>"
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Esta a punto de borrar objetos incompletos.<br>Esto causará problemas "
-#~ "porque usted no ve el objeto real.<br>¿Desea realmente borrarlos?"
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "Por favor, seleccione manualmente una vía OSM en el Editor Básico."
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM encontró {0} capas de datos OSM sin guardar. Parece que la ultima "
-#~ "vez que se utilizó JOSM este se colgó. ¿Desea restaurar lo datos?"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr ""
-#~ "No se pudieron leer los datos osm salvados automáticamente ({0}) - {1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "El objeto de tipo {0} con id {1} se marcó para borrar, pero no existe en "
-#~ "el conjunto de datos fuente"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Conflicto en atributo 'visible' para el objeto de tipo {0} con id {1}\r\n"
-#~ "La misma versión, pero con atributo \"visible\" distinto.  Indica un "
-#~ "problema serio en los conjuntos de datos.  Por ejemplo, los conjuntos de "
-#~ "datos pueden descargarse de diferentes servidores OSM o haber sido "
-#~ "modificados manualmente de forma errónea.  No deberíamos mezclar los "
-#~ "conjuntos de datos."
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">No existe contenido de ayuda para el "
-#~ "tema</p><p class=\"warning-body\">No está disponible todavía el contenido "
-#~ "de ayuda para  <strong>{0}</strong>.  No existe ni en su idioma local  "
-#~ "({1}) ni en inglés.  <br><br>Por favor ayude a mejorar el sistema de "
-#~ "ayuda de JOSM diligenciando la información faltante.  Puede o bien editar "
-#~ "el e <a href=\"{2}\">tema de ayuda en su idioma local ({1})</a> y el <a "
-#~ "href=\"{3}\">tema de ayuda en inglés</a>.</p></html>"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>No están habilitados ni <strong>{0}</strong> ni <strong>{1}</"
-#~ "strong>. <br>Por favor escoja descargar datos de OSM, GPS o ambos.</html>"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Advertencia: Fallo al interpretar estilos Mappaint de \"{0}\". La "
-#~ "excepción fue: {1}"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Limpiado objeto ''{0}''"
-
-#~ msgid "Edit SeaMap Symbols"
-#~ msgstr "Editar símbolos SeaMap"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Está configurando un rol vacío en la primitiva {0}"
-#~ msgstr[1] "Está configurando reles vacíos en las primitivas {0}"
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Advertencia:</strong> La clave se transfiere <strong>una vez</"
-#~ "strong> en texto plano al sitio OSM. <strong>NO<strong> ue una clave "
-#~ "sensible hasta que el servidor OSM ofrezca un canal de comunicación "
-#~ "encriptado(HTTPS)."
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Permitir cambiar el etiquetado de puntos de traza."
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Advertencia: No se encontró la preferencia \"{0}\"."
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>No se pudo cargar el plugin {0} porque el plugin<br>clase principal "
-#~ "\"{1}\" no se encontró.<br> ¿Borrar de las preferencias?"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "Alinear resultaría en nodos fuera del planeta.\n"
-#~ "Su acción se deshará."
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr "No puede alinear segmentos conectados."
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Bienvenido al Plugin</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">Alineación de Vías<span style="
-#~ "\"color: rgb(204, 85, 0);\">S</span><br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...O mejor debería llamrse <br>\n"
-#~ "Plugin <span style=\"font-size: large;\">AlignWays(Alineación de "
-#~ "segmentos de vía)</span> ...</span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "<li><b>Alinear los segmentos.</b> Presione <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. También puede encontrar la orden en el menú de "
-#~ "<b>Herramientas</b>\n"
-#~ "o puede colocar la acción en la <b>barra de herramientas</b>.\n"
-#~ "</li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid "Building tag:"
-#~ msgstr "Etiqueta de edificación"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Esta característica requiere(por lo menos) una identificación especial\n"
-#~ "para capas de Edificaciones y capa de datos OSM"
-
-#~ msgid "Grab buildings"
-#~ msgstr "Tomar edificaciones"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr ""
-#~ "Extraer edificación al marcar con el mouse(Solamente imágenes vectoriales)"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "No use relaciones para direcciones (pero \"addr:street\" para elementos)."
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Obtener capa de edificaciones únicamente"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Carga calibración de datos al fichero"
-
-#~ msgid "read protocol version"
-#~ msgstr "leer versión de protocolo"
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Editor de marcas marinas"
-
-#~ msgid "Edit OpenSeaMap"
-#~ msgstr "Editar OpenSeaMap"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Insertar objetos 'vía' desde el portapapeles"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Esta restricción de giro usa la vía OSM <span class=\"object-name\">{0}</"
-#~ "span> con rol <tt>de</tt> <strong>y</strong> con rol <tt>a</tt>. En una "
-#~ "restricción de giro, la vía con el rol <tt>de</tt> debería ser diferente "
-#~ "a la vía con el rol <tt>a</tt>."
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "La vía-<strong>de</strong> <span class=\"object-name\">{0}</span> y la "
-#~ "vía-<strong>a</strong> <span class=\"object-name\">{1}</span> se "
-#~ "intersectan en el nodo <span class=\"object-name\">{2}</span> pero <span "
-#~ "class=\"object-name\">{2}</span> no es un objeto de tipo <strong>vía</"
-#~ "strong>.<br> Se recomienda establecer a  <span class=\"object-name\">{2}</"
-#~ "span> como único objeto-<strong>via</strong>."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Cambiar al editor básico y seleccionar una vía OSM"
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "La vía OSM <span class=\"object-name\">{0}</span> con el rol <tt>{1}</tt> "
-#~ "debería partirse en el nodo  <span class=\"object-name\">{2}</span> donde "
-#~ "se conecta a la vía <span class=\"object-name\">{3}</span>."
-
-#~ msgid "Splits the way"
-#~ msgstr "Parte la vía"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Esta restricción de giro usa el nodo <span class=\"object-name\">{0}</"
-#~ "span> como miembro del rol <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Esta restricción de giro usa la relación OSM <span class=\"object-name\">"
-#~ "{0}</span> como miembro del rol <tt>{1}</tt>."
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Se requiere una vía OSM"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% de la traza GPS"
-
-#~ msgid "play/pause"
-#~ msgstr "reproducir/pausar"
-
-#~ msgid "backward"
-#~ msgstr "retroceder"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "por favor ingrese el código de tiempo GPS"
-
-#~ msgid "slower"
-#~ msgstr "más lento"
-
-#~ msgid "faster"
-#~ msgstr "más rápido"
-
-#~ msgid "forward"
-#~ msgstr "avanzar"
-
-#~ msgid "jump"
-#~ msgstr "saltar"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "El script hijo devolvió datos invalidos."
-
-#~ msgid "Image not created properly."
-#~ msgstr "No se creó apropiadamente la imagen."
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr ""
-#~ "El control remoto solicitó descargar una capa WMS de la siguiente URL:"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Permitir control remoto(requiere el plugin de control remoto)"
-
-#~ msgid "farmland"
-#~ msgstr "campo"
-
-#~ msgid "With kiosk"
-#~ msgstr "Con quiosco"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Al parecer JOSM se congeló la última vez. ¿Desea restaurar sus datos?"
-
-#~ msgid "Internal style"
-#~ msgstr "Estilo interno"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Cambio de propiedades en un objeto"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr "Tiene seleccionados {0} elementos. Pero solamente puede editar uno!"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Para alinear segmentos.</b> Presionar <b><i><span style=\"color:"
-#~ "green\">"
-
-#~ msgid "import data from URL"
-#~ msgstr "Importar datos desde URL"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "No se pudo inicializar el control remoto."
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "El plugin control remoto no es compatible con {0}."
-
-#~ msgid ""
-#~ "{0} will work but remote control is disabled.\n"
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "You should update the plugins. If this does not help report a bug for "
-#~ "\"{0}\"."
-#~ msgstr ""
-#~ "{0} funcionará pero el control remoto está deshabilitado.\n"
-#~ "Versión actual de \"{1}\": {2}, versión interna {3}. Se requiere la "
-#~ "versión {4}, versión interna {5}.\n"
-#~ "Debería actualizar los plugins. Si no se soluciona reporte un fallo para "
-#~ "\"{0}\"."
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: Problema con control remoto"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Tag predeterminado Erroneo \"{0}-{1}\" - número de elementos en "
-#~ "display_values debe ser el mismo presente en values"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Capa WMS sin nombre"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "Añadir la url del WMS"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Ese layer no soporta ninguna proyección de JOSM, \n"
-#~ "por lo tanto no puede usarlo. No se volverá a mostrar de nuevo."
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} funcionará pero el control remoto para esta capá está deshabilitado.\n"
-#~ "Debería actualizar los plugins"
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "La versión actual de \"{1}\": {2}, versión de intervalo {3}. Se requiere "
-#~ "la versión {4}, versión interna {5}.\n"
-#~ "Si no se arregla actualizando el plugin, reporte un fallo para \"{0}\"."
-
-#~ msgid ""
-#~ "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to "
-#~ "grab."
-#~ msgstr ""
-#~ "Añadir la(s) tabla(s) de ensamblaje en la lista de hojas del catastro a "
-#~ "descargar."
-
-#~ msgid "Add relation"
-#~ msgstr "Añadir relación"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr ""
-#~ "El nivel de acercamiento no fue suficiente para almacenar un corrimiento "
-#~ "preciso"
-
-#~ msgid "Get Capabilities"
-#~ msgstr "Obtener capacidades"
-
-#~ msgid "Remote WMS"
-#~ msgstr "WMS remoto"
-
-#~ msgid "used"
-#~ msgstr "usado"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr ""
-#~ "Abrir el navegador con la para wiki de ayuda del objeto seleccionado"
-
-#~ msgid "Seamap Editor"
-#~ msgstr "Editor en mar"
-
-#~ msgid "Seanap Editor"
-#~ msgstr "Editor en mar"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Perfil de elevación de pista"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "Proyección actual se establece en {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "Proyección conjunto de {0} a {1}"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "set {0}"
-#~ msgstr "Conjunto {0}"
-
-#~ msgid "Load file"
-#~ msgstr "Cargar el archivo"
-
-#~ msgid "it works realy fine"
-#~ msgstr "Funciona realmente bien"
-
-#~ msgid "Could not parse file. Not a PDF file?"
-#~ msgstr "No se pudo analizar el archivo. ¿Es un archivo PDF?"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "balizas de navegación cartografiadas"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Área simplificada (eliminado {0} nodo)"
-#~ msgstr[1] "Área simplificada (eliminados {0} nodos)"
-
-#~ msgid "Seamarks"
-#~ msgstr "Balizas de navegación"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Estilos disponibles (desde {0}):"
-
-#~ msgid "Apply all guesses"
-#~ msgstr "Aplicar a todos los supuestos"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Por favor, ajusta la capa WMS de forma manual mediante el uso de objetos/"
-#~ "trazas conocidas con posición exacta antes de iniciar el mapa"
-
-#~ msgid "Select in map"
-#~ msgstr "Seleccionar en el mapa"
-
-#~ msgid "Guess street names"
-#~ msgstr "Nombres de calles supuestos"
-
-#~ msgid "Post Code"
-#~ msgstr "Código postal"
-
-#~ msgid "Guess address data"
-#~ msgstr "Datos de direccion supuestos"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "replazado por {0} componente"
-
-#~ msgid "Re-open bug"
-#~ msgstr "Reabrir error"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "Invalidar error"
-
-#~ msgid "Close bug"
-#~ msgstr "Cerrar error"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Migración de la configuración de imágenes"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr ""
-#~ "Migración de la configuración de imágenes: conflicto al mover la matriz "
-#~ "{0} -> {1}"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Migración de la configuración de imágenes: conflicto al mover la "
-#~ "propiedad {0} -> {1}"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Por favor, elije al menos dos nodos para fusionar o un nodo que se "
-#~ "encuentra cerca de otro nodo."
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Proyección \"{0}\" no encontrada"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Lista de capas WMS:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Configuración del mapa desplazable:"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Advertencia: conflicto con las configuraciones inexperado"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Conservar la configuración actual"
-
-#~ msgid "Keep current list"
-#~ msgstr "Conservar la lista actual"
-
-#~ msgid "Add comment"
-#~ msgstr "Añadir comentario"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "Ingrese las coordenadas para el nuevo nodo.<br/>Puede separar la longitud "
-#~ "y la latitud con espacio, coma o punto y coma.<br/>Use números positivos "
-#~ "o los caracteres N,E  para indicar el punto cardinal Norte y Este "
-#~ "respectivamente.<br/>Para los puntos cardinales Sur y Oeste puede emplear "
-#~ "o bien números negativos o los caracteres S,W.<br/>El valor de la "
-#~ "coordenada puede estar en tres formatos:<ul><li><i>grados</i><tt>&deg;</"
-#~ "tt></li><li><i>grados</i><tt>&deg;</tt> <i>minutos</i><tt>&#39;</tt></"
-#~ "li><li><i>grados</i><tt>&deg;</tt> <i>minutos</i><tt>&#39;</tt> "
-#~ "<i>segundos</i><tt>&quot</tt></li></ul>Los símbolos <tt>&deg;</tt>, "
-#~ "<tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> son "
-#~ "opcionales.<br/><br/>Ejemplos:<ul><li>49.29918&deg; 19.24788&deg;</"
-#~ "li><li>N 49.29918 E 19.24788</li><li>W 49&deg;29.918&#39; S "
-#~ "19&deg;24.788&#39;</li><li>N 49&deg;29&#39;04&quot; E "
-#~ "19&deg;24&#39;43&quot;</li><li>49.29918 N, 19.24788 E</"
-#~ "li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</li><li>49 29 "
-#~ "51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "slippymap tiene  {0} preferencias desconocoidas"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Sobreescribir con la lista WMSPlugin"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "WMSPlugin tiene  {0} preferencias desconocoidas"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Migración de las preferencias para WMSPlugin/SlippyMap"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Opciones de WMSPlugin:"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Sobreescribir con las opciones de WMSPlugin"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Sobreescribir con las opciones de SlippyMap"
-
-#~ msgid "OSM-Cert"
-#~ msgstr "Cert-OSM"
-
-#~ msgid "Key Signatures"
-#~ msgstr "Llaves de Firmas"
-
-#~ msgid "Key certified for OSM-Usage with comment:{0}"
-#~ msgstr "Llave certificada para uso en OSM con comentario: {0}"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "Comando GnuPG a ejecutar:"
-
-#~ msgid "Privacy"
-#~ msgstr "Privacidad"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "No preguntar de nuevo por la llave"
-
-#~ msgid "Internal Style"
-#~ msgstr "Estilo interno"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "Permite ejecutar scripts en JOSM"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Mostrar zoom: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Zoom actual: {0}"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Zoom óptimo: {0}"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "Une el contorno de un área con el contorno de otra área"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "No se puede elegir un nodo aislado"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Componente para hacer coincidir las fotografías con los puntos de interés "
-#~ "recogidos en un archivo GPX. La correlación se produce cuando los "
-#~ "atributos \"name\", \"cmt\" o \"desc\" de un punto coinciden con el "
-#~ "nombre del archivo de una imagen."
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Escala de píxel: {0}"
-
-#~ msgid "remove entry"
-#~ msgstr "eliminar entrada"
-
-#~ msgid "Contour Merge"
-#~ msgstr "Unión de contornos"
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr ""
-#~ "Une de manera precisa los contornos de dos áreas próximas evitando "
-#~ "sliders o falsos polígonos"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "Añadir una nueva entrada WMS/TMS introduciendo la URL"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful( don't destray valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "La siguiente lista de elementos son el resultados de una validación "
-#~ "automática de posibles errores. Trate de corregirlos pero sea cuidadoso, "
-#~ "no elimine datos válidos. En caso de duda ignórelos.<br>Si cancela este "
-#~ "cuadro de diálogo podrá encontrar estos elementos en el panel lateral de "
-#~ "validación, donde podrá inspeccionarlos."
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "A continuación se muestran los resultados de la validación automática. "
-#~ "Intente arreglarlos, pero tenga cuidado (no destruya datos válidos). Si "
-#~ "tiene dudas, ignórelos.<br>Cuando cancele este diálogo, podrá encontrar "
-#~ "estas entradas en el panel de resultados de la validación para ver los "
-#~ "detalles."
-
-#~ msgid "Run"
-#~ msgstr "Ejecutar"
-
-#~ msgid "File:"
-#~ msgstr "Archivo:"
-
-#~ msgid "Run..."
-#~ msgstr "Ejecutar..."
-
-#~ msgid "Run a script"
-#~ msgstr "Ejecutar un script"
-
-#~ msgid "Run the script"
-#~ msgstr "Ejecutar el script"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Script Error"
-#~ msgstr "Error del script"
-
-#~ msgid "cancel"
-#~ msgstr "cancelar"
-
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
-
-#~ msgid "Version:"
-#~ msgstr "Versión:"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr "Arrastre el segmento de vía y suéltelo sobre un segmento de destino"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Botón izquierdo del ratón: deseleccionar nodo"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Botón derecho del ratón: seleccionar nodo"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Unir contorno"
-
-#~ msgid "lane"
-#~ msgstr "pasillo"
-
-#~ msgid "sidewalk"
-#~ msgstr "acera"
-
-#~ msgid "parking_lot"
-#~ msgstr "plaza de aparcamiento"
-
-#~ msgid "Analyzing"
-#~ msgstr "Analizando"
-
-#~ msgid "Makes a paralell copy of the selected way(s)"
-#~ msgstr "Hace una copia en paralelo de la(s) vía(s) seleccionada(s)"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (servidor espejo)"
+#~ "JOSM escuchará siempre el puerto 8111 de localhost. Este puerto no es "
+#~ "configurable porque es referenciado por aplicaciones externas que se "
+#~ "comunican con JOSM."
+
+#~ msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+#~ msgstr "Serán conectadas las vías adyacentes. Los nodos se deseleccionarán."
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Datos potencialmente erróneos. ¿Cargarlos a pesar de ello?"
+
+#~ msgid "unkown"
+#~ msgstr "desconocido"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 26529)
+++ applications/editors/josm/i18n/po/et.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:22+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:49+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:43+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Abi"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoreerin vigast faili URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,5 +119,5 @@
 msgstr "Hoiatus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
@@ -124,10 +125,10 @@
 "URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoreerin vigast URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -137,13 +138,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Välju JOSMist"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Jätka, proovi ikka"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -163,7 +164,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -173,6 +174,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -203,5 +204,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -383,6 +384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -409,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -415,7 +416,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -423,5 +425,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -630,5 +632,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -878,5 +880,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -885,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1064,6 +1066,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1214,5 +1216,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1430,6 +1432,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "Viide"
@@ -2079,5 +2081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2389,7 +2391,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Andmete allalaadimine"
@@ -2642,5 +2644,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2770,10 +2772,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2933,5 +2935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3491,5 +3493,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3540,40 +3542,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
+msgid "Set {0}={1} for node ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
-#, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3693,4 +3695,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3987,6 +3990,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4023,5 +4026,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4125,5 +4128,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4225,5 +4228,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4242,8 +4245,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4383,50 +4386,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr ""
@@ -4451,80 +4468,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4742,45 +4779,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5047,5 +5084,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5070,5 +5107,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5079,5 +5116,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5483,5 +5520,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5547,5 +5584,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr ""
@@ -5553,5 +5590,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5559,10 +5596,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr ""
@@ -5572,5 +5609,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5584,5 +5621,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5595,5 +5632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5951,5 +5988,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6058,4 +6095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6154,5 +6192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6195,5 +6233,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6480,6 +6518,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6707,9 +6745,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr ""
 
@@ -6766,6 +6804,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6787,6 +6825,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7173,5 +7211,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7409,5 +7447,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7621,7 +7659,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "tundmatu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7885,5 +7953,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7903,5 +7971,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7918,5 +7986,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7924,5 +7992,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -7965,5 +8033,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7971,5 +8039,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8162,5 +8230,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8260,5 +8328,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr ""
@@ -9252,5 +9319,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9432,5 +9499,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9573,4 +9640,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9582,4 +9650,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9842,9 +9916,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9853,13 +9927,13 @@
 msgstr[1] "Muudetakse kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Puuduv väärtus kustutab sildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9872,18 +9946,19 @@
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Muuta väärtusi?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9892,5 +9967,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9900,5 +9975,5 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9907,27 +9982,31 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9936,62 +10015,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Abi siltide kasutamise kohta saab OSMi vikist (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10055,8 +10134,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10079,5 +10160,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10407,9 +10488,4 @@
 msgstr "Impordi ajal tekkis {0} vastuolu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10449,10 +10525,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10727,37 +10797,4 @@
 msgstr "Tüüp"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "tundmatu"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10873,20 +10910,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -10978,5 +11015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11517,8 +11554,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11920,4 +11957,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11943,11 +11981,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12024,38 +12055,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Kohanda värvi"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Vaikimisi"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Vali värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12066,9 +12097,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12076,26 +12107,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12104,8 +12135,8 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12114,12 +12145,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12128,10 +12159,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12139,78 +12170,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12219,11 +12250,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12231,6 +12262,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12238,27 +12269,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Heli import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12268,29 +12299,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Piltide import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12394,5 +12425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12402,57 +12433,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -12975,10 +13014,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -12986,5 +13025,5 @@
 msgstr[1] "markerid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -12993,26 +13032,26 @@
 msgstr[1] "{0} koosneb {1} markerist"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Pole heli markerit millest nihutada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Muuda markertekstide ja ikoonide nähtavust."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Sünkroniseeri heli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Kui kuuled sünkroniseerimisvihjet, pead heli pausile panema."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13020,14 +13059,14 @@
 msgstr "Heli sünkroniseeritud punktis {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Ei saa sükroniseerida kihis mis mängib."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Loo heli marker mängimise alguses"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13053,13 +13092,13 @@
 msgstr "Ei saa uut heli markerit luua."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Tekkis viga kui prooviti kuvada selle markeri URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL oli: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Viga URL kuvamisel"
@@ -13993,82 +14032,82 @@
 msgstr "Värvid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Joonista suuna nooled"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Joonista mitteaktiivsed kihid teist värvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14076,15 +14115,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
+msgid "Use global settings."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14095,47 +14170,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+msgid "Force lines if no segments imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
+msgid "Draw large GPS points."
+msgstr ""
+
+#. hdopCircleGpsPoints
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
-msgid "Draw large GPS points."
-msgstr ""
-
-#. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14143,5 +14210,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14165,5 +14232,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14206,5 +14273,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14218,38 +14285,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14258,10 +14305,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14269,35 +14316,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14305,14 +14352,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr ""
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14320,13 +14367,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14334,27 +14381,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15016,5 +15081,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15106,5 +15171,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr ""
@@ -15381,6 +15446,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Uuenda alati küsimata"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -15770,5 +15835,5 @@
 msgstr "Uus relatsioon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15797,9 +15862,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16077,6 +16142,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16399,5 +16464,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16609,5 +16674,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17000,4 +17065,9 @@
 msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17794,4 +17864,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -17911,4 +17983,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18474,5 +18560,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34773,4 +34859,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34787,6 +34874,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34805,15 +34892,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "lühendatud tänava nimi"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "ühesuunaline silt sõlmel (oneway)"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "silla silt sõlmel"
@@ -34824,12 +34911,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "vale maantee silt sõlmel"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Nimeta kategoriseerimata tee"
@@ -34838,16 +34925,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "viiteta maantee"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "ajutise maantee tüüp"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "valesti kirjutatud maantee silt"
@@ -34857,10 +34944,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "jalgrattatee jalgratta sildiga (cycleway vs cycle)"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "kõnnitee jala sildiga (footway vs foot)"
@@ -34869,10 +34956,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "cycleway ei saa olla rida cyclewayl"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "tõke teel"
@@ -34881,35 +34968,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "kõnniteele on määratud maksimaalne kiirus"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "kihi silt + märgiga"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "tänava nimi sisaldab ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relatsioon ilma tüübita"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "nimeta restoran"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "ebatavaline sildikombinatsioon"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35014,117 +35110,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Tšehhi CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Tšehhi UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7. seeria (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Jaapan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Jaapan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Jaapan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Jaapan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Itaalia"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sitsiilia - Itaalia"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Itaalia"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35369,5 +35475,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr ""
 
@@ -35470,9 +35576,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35490,23 +35596,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35514,26 +35650,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Info"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35541,5 +35705,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35650,9 +35814,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35751,17 +35915,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36392,28 +36573,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36531,6 +36719,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37412,5 +37600,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37420,17 +37608,17 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr ""
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+msgid "Draw lines between points for this layer."
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr ""
@@ -37582,5 +37770,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37588,10 +37776,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37600,5 +37788,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37607,6 +37795,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37615,9 +37803,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37776,71 +37964,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37848,32 +38044,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -37908,6 +38098,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38038,30 +38228,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38749,5 +38952,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38764,5 +38967,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39490,17 +39693,17 @@
 msgstr "Uus pildikiht lõikepuhvrist"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Uus pildikiht failist"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayeril ei õnnestunud pilti laadida või importida."
@@ -39514,36 +39717,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40165,5 +40364,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41131,4 +41330,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41348,6 +41564,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41594,5 +41810,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42163,5 +42379,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42547,1017 +42763,10 @@
 msgstr ""
 
-#~ msgid "Upload these changes?"
-#~ msgstr "Kas laen need muudatused üles?"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Lae OSMi serverisse"
-
-#~ msgid "Move"
-#~ msgstr "Liiguta"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Ava eelistuse leht, et muuta globaalseid sätteid"
-
-#~ msgid "Data Layer"
-#~ msgstr "Andmekiht"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Palun sisesta enne soovitud kordinaadid."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Palun sisesta koha nimi."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Vali enne järjehoidja."
-
-#~ msgid "File could not be found."
-#~ msgstr "Faili ei leitud"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Lae kõik muudatused OSM serverisse üles."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Lahendamata konfliktid! Sa pead need enne lahendama."
-
-#~ msgid "Uploading data"
-#~ msgstr "Andmete üles laadimine"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pole veel teostatud."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tundmatu faililaiend."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Load Selection"
-#~ msgstr "Lae valik"
-
-#~ msgid "Downloading..."
-#~ msgstr "Allalaadimine..."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Palun sisesta otsingu tekst"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Kustuta valitud kiht"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punkt"
-#~ msgstr[1] "punktid"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} kustutatud.)"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punkt"
-#~ msgstr[1] "{0} punkti"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "pilt"
-#~ msgstr[1] "pildid"
-
-#~ msgid "Sync clock"
-#~ msgstr "Sünkroniseeri kell"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Ei suutnud salvestada järjehoidjat"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Ei suutnud lugeda järjehoidjaid"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Salvestamata muudatused"
-
-#~ msgid "layer not in list."
-#~ msgstr "kiht ei ole nimekirjas"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Viga parsimisel"
-
-#~ msgid "their version:"
-#~ msgstr "nende versioon:"
-
-#~ msgid "my version:"
-#~ msgstr "minu versioon:"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM parool"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kasutajanimi (email)"
-
-#~ msgid "Do not show again"
-#~ msgstr "Rohkem ei näidata"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Palun teata piletiga {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Lisa kindlasti järgnev info:"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)."
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast "
-#~ "uuesti ."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ei oma ref"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tundmatu versioon"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Valmistan andmeid ette..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Viga sõelumisel."
-
-#~ msgid "Commit comment"
-#~ msgstr "Lisa kommentaar"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Parse error: vigane gpx dokumendi struktuur"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Puudub vajalik atribuut \"{0}\"."
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} jäänud. Laen üles {4}: {5} (id: {6})"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Avan muutustekogumit..."
-
-#~ msgid "Preparing..."
-#~ msgstr "Ettevalmistus..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server ei toeta muutustekogumeid"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Ülekanne katkestatud vea tõttu (ootan 5 sekundit):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Üleslaadimine..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Vale salasõna või kasutajanimi."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
-
-#~ msgid "Aborting..."
-#~ msgstr "Katkestan..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Sisesta salasõna"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Salvesta ja välju"
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Palun sisesta otsingutekst"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
-
-#~ msgid "zoom"
-#~ msgstr "suurendus"
-
-#~ msgid "near"
-#~ msgstr "lähedal"
-
-#~ msgid "x from"
-#~ msgstr "x kohast"
-
-#~ msgid "to"
-#~ msgstr "kuni"
-
-#~ msgid "y from"
-#~ msgstr "y kohast"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
-
-#~ msgid "Download Area"
-#~ msgstr "Allalaetav ala"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Andme allikad ja tüübid"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Eelseadete grupp \"{0}\""
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Tühi väärtus kustutab võtme."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Ühendun OSM serveriga"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Muuda uut seost"
-
-#~ msgid "Create new relation"
-#~ msgstr "Loo uus seos"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Sildid (tühi väärtus kustutab sildi)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Kasutab"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Muuda seost #{0}"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Eemalda kõik hetkel valitud objektid seosest"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eemalda valitud"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisa valitud"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Ei saa serveriga ühenduda."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Viga serveri vastuse töötlemisel."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Importimisel tekkisid konfliktid."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Liikmed: {0}"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud "
-#~ "versiooniks."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autorid: {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "On salvestamata muutusi. Kustutan kihi ikkagi?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Kas sa tõesti tahad kogu kihti kustutada?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Ühenda kiht otse all valitud kihti."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Näita/Peida Tekst/Ikoonid"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Kihid: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Värskenda valikute nimekirja."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Ühendan vastuolusid."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Käsujada: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konfliktid: {0}"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Lahenda konfliktid"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Laadisin alla pluginate info {0} saidilt"
-#~ msgstr[1] "Laadisin alla pluginate info {0} saidilt"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Pluginate infot ei leitud"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla "
-#~ "laadida."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versioon {1}{2}"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Kasuta kraade kümnendsüsteemis."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Lisa koordinaadid uuele sõlmele."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negatiivsed väärtused märgivad lääne/lõunapoolkera."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sobita erinevate kuuluvustega teed?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sobita ikkagi."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Sisesta kõigi vastuolude kohta väärtused."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kõik teed olid tühjad."
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Lahenda vastuolud."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Need sõlmed ei ole ringis."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Palun vali täpselt kolm sõlme või tee täpselt kolme sõlmega."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Viga lehekülje {0} laadimisel."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Abileht puudub. Loo see <A HREF=\"{0}\">english</A> või <A HREF="
-#~ "\"{1}\">eesti</A>"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Ava sirvikus"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM võrguabi"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Palun vali vähemalt kaks sõlme mida liita."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Näita OSM sõlmede ja teede ajalugu."
-
-#~ msgid "History of Element"
-#~ msgstr "Elemendi ajalugu."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles "
-#~ "laetud elementidel on ajalugu."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Liida igal juhul."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Liida erineva kuuluvusega sõlmed?"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel."
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Tundmatud laused: "
-
-#~ msgid "Create a new map."
-#~ msgstr "Loo uus kaart."
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Vigaselt vormindatud laused: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Kontrollsumma vead: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA impordi viga!"
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Null koordinaadid: "
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed."
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Valik peab koosnema ainult kahest sõlmest."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Ainult kaks sõlme lubatud."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Sa kasutad EPSG:4326 projektsiooni, mis võib viia <br>soovimatute "
-#~ "kujunditeni, kui praegu täisnurkselt seada. <br>sellest hoiatusest "
-#~ "vabanemiseks muuda oma projektsiooni. <br>Kas jätkame?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Ainult üks sõlm valitud."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Ei saa faili {0} ümber nimetada."
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME parandatud)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun "
-#~ "teata sellest veast arendajaid."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Ei saa faili varundada."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Salvestamisel ilmnes viga."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Varundatud faili taastamisel ilmnes viga"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Leidub <member> element, mis ei ole seotud"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Olid probleemid järgnevate pistikutega:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Rollipõhised seosed kopeeriti uutele teedele.\n"
-#~ "Vaata need igaks juhuks üle."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes."
-
-#~ msgid "optician"
-#~ msgstr "optika"
-
-#~ msgid "sports"
-#~ msgstr "spordi"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Vali joogi pood"
-
-#~ msgid "Charge"
-#~ msgstr "Kulu"
-
-#~ msgid "Rugby"
-#~ msgstr "Ragbi"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Vali ragbi"
-
-#~ msgid "Jump back."
-#~ msgstr "Hüppa tagasi"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Kordista {0} sõlme {1} sõlmeks"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed "
-#~ "laaditud?"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Uuendab praeguse andmekihi serverist (laadib uuesti)."
-
-#~ msgid "Update Data"
-#~ msgstr "Uuenda andmed"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Eelmine järjehoidja"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Mängi eelmine järjehoidja"
-
-#~ msgid "Play next marker."
-#~ msgstr "Mängi järgmine järjehoidja"
-
-#~ msgid "Next Marker"
-#~ msgstr "Järgmine järjehoidja"
-
-#~ msgid "Jump forward"
-#~ msgstr "Hüppa edasi"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "On salvestamata muudatusi. Tühista muudatused ja jätka?"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Praegu saab ühendada ainult kuni kaks ala."
-
-#~ msgid "zoom level"
-#~ msgstr "suurendusaste"
-
-#~ msgid "No data imported."
-#~ msgstr "Andmeid ei imporditud."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Aeglasemalt edasi"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Mass-allalaadimisel leidsid aset järgmised vead:"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Kiiremini edasi"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Pistik edukalt uuendatud. Palun taaskäivita JOSM."
-#~ msgstr[1] "{0} pistikut edukalt uuendatud. Palun taaskäivita JOSM."
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr "Projektsioon ei olnud eelistustest loetav. Kasutan Mercatori."
-
-#~ msgid "Change"
-#~ msgstr "Muuda"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Kustuta {1} {0}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Kustuta {0} {1}"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konfliktne relatsioon"
-
-#~ msgid "Full Screen"
-#~ msgstr "Täisekraan"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr "Projektsiooni ei saanud eelistusest lugeda. Kasutan Mercatori"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API initsialiseerimine ebaõnnestus"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Valitud primitiivide uuendamine ebaõnnestus."
-
-#~ 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] ""
-#~ "Valik sisaldab {0} teed. Kas oled kindel, et soovid seda lihtsustada?"
-#~ msgstr[1] ""
-#~ "Valik sisaldab {0} teed. Kas oled kindel, et soovid neid lihtsustada?"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Ei ole valitud primitiive mida uuendada."
-
-#~ msgid "Update Selection"
-#~ msgstr "Uuenda valik"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Puuduv primitiiv"
-
-#~ msgid "Uploading"
-#~ msgstr "Üleslaadimine"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Primitiivi uuendamine"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Avastatud konflikt"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Relatsiooni liikmelisus kopeeriti kõikidele uutele teedele.\n"
-#~ "Seda tuleb kontrollida ning vajadused viia sisse parandused."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Laadimine OSM API-le ebaõnnestus"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiiv on juba kustutatud"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Massilisel allalaadimisel leidsid aset järgmised vead:"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Kustutatud või nihutatud primitiivid"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}"
-
-#~ msgid "No data"
-#~ msgstr "Andmeid pole"
-
-#~ msgid "Update failed"
-#~ msgstr "Uuendamine ebaõnnestus"
-
-#~ msgid "gps track description"
-#~ msgstr "GPS jälje kirjeldus"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Seadete muutmine"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd> element võib olla vaid way-s."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Keelatud objekti number id=0"
-
-#~ msgid "Cycleway"
-#~ msgstr "Jalgrattatee"
-
-#~ msgid "Footway"
-#~ msgstr "Jalgtee"
-
-#~ msgid "Shop"
-#~ msgstr "Pood"
-
-#~ msgid "Accomodation"
-#~ msgstr "Majutus"
-
-#~ msgid "football"
-#~ msgstr "ameerika_jalgpall"
-
-#~ msgid "Amenities"
-#~ msgstr "Teenused"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konfliktid andmetes"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Sünkroniseeri ainult {0} {1}"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktiveerin uuendatud pistikrakendused"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Pistikrakenduste uuendamine"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Uuendatud pistikrakenduste aktiveerimine ebaõnnestus. Kontrolli, kas "
-#~ "JOSMil on piisavalt õigusi olemasolevate pistikrakenduste "
-#~ "ülekirjutamiseks."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lae puuduvad pistikrakendused alla"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Kas laen järgnevad pistikrakendused alla?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Enne veast teatamist püüa uuendada JOSM ja kõik pistikrakendused uusima "
-#~ "versioonini."
-
-#~ msgid "Download List"
-#~ msgstr "Lae nimekiri alla"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konfliktid allalaadimisel"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parameeter ''{0}'' ei tohi olla null"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja "
-#~ "iga muudetud primitiivi kohta eraldi päringu kasutamiseks"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "lae kõik muudatused ühe päringuga"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Värskendab valitud primitiivid serverist"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parameeter ''{0}'' ei tohi olla null"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Abileht puudub. Loo see <A HREF=\"{0}\">English</A> või <A HREF="
-#~ "\"{1}\">eesti</A>"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameeter ''{0}'' ei tohi olla null"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Ei suutnud lugeda \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida."
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Lae andmed juba avatud muutustekogumisse"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Vali, kas andmed tuleb alla laadida uude kihti"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Viga allalaadimisel"
-
-#~ msgid "white"
-#~ msgstr "valge"
-
-#~ msgid "blue"
-#~ msgstr "sinine"
-
-#~ msgid "red"
-#~ msgstr "punane"
-
-#~ msgid "gray"
-#~ msgstr "hall"
-
-#~ msgid "brown"
-#~ msgstr "pruun"
-
-#~ msgid "black"
-#~ msgstr "must"
-
-#~ msgid "line"
-#~ msgstr "joon"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Palun sisesta laiuskraad vahemikus -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Palun sisesta sobiv pikkuskraad vahemikus -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Palun sisesta sobiv laiuskraad vahemikus -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Palun sisesta pikkuskraad vahemikus -180..180"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Te olete käivitamas {0} brauseriakent. <br>See võib tekitada ekraanil "
-#~ "segadust brauseriakendega<br>ning võtta mõnevõrra aega."
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Sule dialoog, ära loo uut sõlme"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Täisekraanvaade"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Nõutud on Id, mis on suurem kui null, sain {0}"
-
-#~ msgid "Fix relations"
-#~ msgstr "Paranda relatsioonid"
-
-#~ 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 ""
-#~ "Valitud tee(de)l on sõlmi väljaspool  alla laetud andmete ala.\n"
-#~ "See võib põhjustada sõlmede tahtmatud kustutamist.\n"
-#~ "Kas oled tõesti kindel, et soovid jätkata?"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Palun vali ühendamiseks vähemalt üks suletud tee."
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Ühendatud iseenesega kattuv ala"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" ei ole suletud ning seega ei saa seda ühendada."
-
-#~ msgid "Download Plugins"
-#~ msgstr "Pistikrakenduste allalaadimine"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Kõik installeeritud pistikrakendused on uuendatud."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Uuenda järgnevad pistikrakendused:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Closed Way"
-#~ msgstr "Suletud tee"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Alade ühendamine: Eemalda lühikesed teed"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Liida valitud primitiivid teise kihti"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Täisekraanvaate lülitamine"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Avan {0} faili..."
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" ei ole suletud ning seega ei saa seda ühendada."
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Määratud on vale ID. Ei saa objekti alla laadida."
-
-#~ msgid "Waterway Point"
-#~ msgstr "Veetee punkt"
-
-#~ msgid "underwater"
-#~ msgstr "veealune"
-
-#~ msgid "Man-Made"
-#~ msgstr "Inimtekkeline"
-
-#~ msgid "tower"
-#~ msgstr "mast"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (peegel)"
-
-#~ msgid "any substance"
-#~ msgstr "mistahes aine"
-
-#~ msgid "overground"
-#~ msgstr "maapealne"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Vali, liiguta ja pööra objekte"
-
-#~ msgid "No username provided."
-#~ msgstr "Kasutajanimi on määramata."
-
-#~ msgid "Active styles"
-#~ msgstr "Aktiivsed stiilid"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Primitiivide üleslaadimiseks ettevalmistamine..."
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Kohenda valitud WMS kihi asukohta."
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Vali kohendamiseks WMS kiht"
-
-#~ msgid "Download Object"
-#~ msgstr "Laadi objekt alla"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Laadi alla primitiivid, mis viitavad ühele valitud primitiividest"
-
-#~ msgid "Download Object..."
-#~ msgstr "Laadi alla objekt..."
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Aluskaardi seadete ülekandmine"
+#~ msgid "Change values?"
+#~ msgstr "Muuta väärtusi?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "ebatavaline sildikombinatsioon"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Uuenda alati küsimata"
Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 26529)
+++ applications/editors/josm/i18n/po/eu.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-19 17:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:47+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:42+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Laguntza"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Gaizki eratutako fitxategiaren URL-a baztertzen: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,5 +119,5 @@
 msgstr "Kontuz"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
@@ -124,10 +125,10 @@
 "izenak onartzen ezta artxiboen URLak ere"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Gaizki eratutako URL-a baztertzen: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -137,13 +138,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Irten JOSMtik"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Jarraitu, saiatu edonola ere"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -163,7 +164,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -173,6 +174,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -203,5 +204,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -387,6 +388,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -413,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -419,7 +420,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -427,5 +429,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -636,5 +638,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -885,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -892,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1072,6 +1074,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1222,5 +1224,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1442,6 +1444,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2121,5 +2123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2439,7 +2441,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Datuak deskargatu"
@@ -2698,8 +2700,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Salbuespenari jaramonik ez deskarga bertan behera geratu delako. Salbuespena "
-"hauxe zen: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2837,10 +2837,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3005,5 +3005,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3616,5 +3616,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3665,40 +3665,40 @@
 msgstr "{0}tik aldatutako nodoak"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Ezabatu \"{0}\" hori ''{1}'' nodotik"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Ezabatu  \"{0}\" hori  ''{1}'' bidetik"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Ezabatu \"{0}\" hori  ''{1}'' erlazio horietarako"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Markatu {0}={1} hurrengo nodo honetarako: ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Markatu {0}={1} hurrengo bide honetarako: ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Markatu {0}={1} hurrengo erlazio honetarako: ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "{1}tik \"{0}\" objektu ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3822,4 +3822,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Konfirmazioa ezabatu"
@@ -4136,9 +4137,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Kontuz: Hobespenen berrezartzeak huts egin du. Lehenetsitako hobespenen "
-"fitxategia berrabiaraztean huts egin du: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4174,8 +4173,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Kontuz: espero ez zen JOSM bertsioa topatu da berrikusketa artxiboan, hauxe "
-"da topatu duguna: ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4281,10 +4278,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM-k jatorrizko [{0} {1}] datu-multzoan aurkitzea espero zuen, baina ez da "
-"horrela izan. Eman honen berri helbide honetan:http://josm.openstreetmap."
-"de . Hau ez da errore garrantzitsu bat, beraz zure lanean jarrai dezakezu."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4388,5 +4382,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4405,8 +4399,8 @@
 msgstr "multipoligonoa"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4549,52 +4543,64 @@
 msgstr "WGS84 Geografikoa"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Kontuz: sarrerako kanala irekitzeko arazoak honekin: ''/data/{0}''. Ezin "
-"izan dugu NTF<->RGF93 sarea kargatu."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 zonalde (Frantzia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} eta {2} arteko graduak)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Korsika)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zonaldea"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zonaldea (Frantzia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zonaldea (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4619,81 +4625,101 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zonaldea"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zonaldea {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suitza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Letonia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zonaldea"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Iparraldea"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Hegoaldea"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Hemisferio"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Desplazatu 3.000.000m ekialdera"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "MartinikaFort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Frantziar Guyana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Frantzia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM Sistema-geodesikoa"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4914,45 +4940,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5221,5 +5247,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5244,5 +5270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5253,5 +5279,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5667,5 +5693,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5735,5 +5761,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "errepidea"
@@ -5741,5 +5767,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5747,10 +5773,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "ubidea"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "lurzorua"
@@ -5760,5 +5786,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5772,5 +5798,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5783,5 +5809,5 @@
 msgstr "garraio publikoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6151,5 +6177,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6260,4 +6286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6362,5 +6389,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6405,11 +6432,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Bestela, <strong>koadro helbide bat</strong> eman zenezake "
-"<i>zoommaila/x/y</i>, formatuan i.e. <i>15/256/223</i>. Koadro helbideak "
-"honako formatuan <i>zoom,x,y</i> or <i>zoom;x;y</i> erabili daitezke baita "
-"ere..</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6698,9 +6721,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Konbinatutako elementuen zerrenda. Nire elementuak ordeztuko dituzte "
-"konbinatzeko erabakiak aplikatzen direnean."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6943,10 +6964,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Gorde nire koordinatuak"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Gorde beraien koordinatuak"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7003,6 +7024,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7024,6 +7045,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7410,5 +7431,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7647,5 +7668,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7859,6 +7880,36 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
 msgstr ""
 
@@ -8123,5 +8174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8141,5 +8192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8156,5 +8207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -8162,5 +8213,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -8203,5 +8254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8209,5 +8260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8400,5 +8451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8498,5 +8549,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Erabiltzailea"
@@ -9490,5 +9540,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9670,5 +9720,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9811,4 +9861,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9820,4 +9871,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -10080,9 +10137,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Propietateak gehitu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10091,13 +10148,13 @@
 msgstr[1] "Horrela {0} objekturaino aldatuko dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10110,18 +10167,19 @@
 msgstr "<ezberdina>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Balioak aldatu?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10130,5 +10188,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10138,5 +10196,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10145,27 +10203,31 @@
 msgstr[1] "Horrela {0} objekturaino aldatuko dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Mesedez, aukeratu balio bat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Mesedez, aukeratu propietateak editatzea nahi dizkiezun objektuak."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Propietateak/Partaidetzak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Aukeratutako objektuen propietateak"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10174,62 +10236,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Kokapena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propietateak: {0} / Partaidetzak: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Propietateak / Partaidetzak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Erlazioa aldatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Erlaziotik ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Propietateak ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10293,8 +10355,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10317,5 +10381,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10645,9 +10709,4 @@
 msgstr "Inportazioa egitean {0} gatazka egon dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10687,10 +10746,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10964,37 +11017,4 @@
 msgstr ""
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11110,20 +11130,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -11215,5 +11235,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11751,8 +11771,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12154,4 +12174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12177,11 +12198,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12258,38 +12272,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12300,9 +12314,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12310,26 +12324,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12338,8 +12352,8 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12348,12 +12362,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12362,10 +12376,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12373,78 +12387,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12453,11 +12467,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12465,6 +12479,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12472,27 +12486,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12502,29 +12516,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12628,5 +12642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12636,57 +12650,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13213,10 +13235,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13224,5 +13246,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13231,41 +13253,41 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13289,13 +13311,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr ""
@@ -14229,82 +14251,82 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
+msgid "Draw Direction Arrows"
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
+msgid "Only on the head of a way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
-msgid "Draw Direction Arrows"
-msgstr ""
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
-msgid "Only on the head of a way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14312,15 +14334,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
+msgid "Use global settings."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14331,47 +14389,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+msgid "Force lines if no segments imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
+msgid "Draw large GPS points."
+msgstr ""
+
+#. hdopCircleGpsPoints
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
-msgid "Draw large GPS points."
-msgstr ""
-
-#. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14379,5 +14429,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14401,5 +14451,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14442,5 +14492,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14454,38 +14504,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14494,10 +14524,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14505,35 +14535,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14541,14 +14571,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr ""
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14556,13 +14586,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14570,27 +14600,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15250,5 +15298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15340,5 +15388,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr ""
@@ -15615,5 +15663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15999,5 +16047,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16026,9 +16074,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16304,6 +16352,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16626,5 +16674,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16836,5 +16884,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17222,4 +17270,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18015,4 +18068,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18125,4 +18180,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18696,5 +18765,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35035,4 +35104,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35049,6 +35119,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35067,15 +35137,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "kale izen laburtua"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "Norabide bakarrean etiketatutako nodoa"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "Zubi moduan etiketatutako nodoa"
@@ -35086,12 +35156,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "okerreko bide-etiketa nodo batean"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Klasifikatu gabeko izen gabeko errepidea"
@@ -35100,16 +35170,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "erreferentziarik gabeko errepidea"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "behin-behineko bide mota"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "Gako izena giaizki idatzita"
@@ -35119,10 +35189,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "bidegorria \"bizikleta\" etiketarekin"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "Oinezkoentzako bidea \"oinezkoentzat\" etiketararekin"
@@ -35131,10 +35201,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "bide batean erabilitako oztopoa"
@@ -35143,35 +35213,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "oinezko bide batentzako erabilitako gehienezko abiadura"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "+ zeinua duen etiketa-geruza"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "kale izenak ss dauka"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "motarik gabeko erlazioa"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "izenik gabeko jatetxea"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "ez-ohiko etiketa konbinaketa"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35276,117 +35355,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Mapak"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Mapak (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (Zazpigarren Serieak) (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japonia (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japonia (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japonia (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japonia (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italia"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sizilia - Italia"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35631,5 +35720,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr ""
 
@@ -35732,9 +35821,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35752,23 +35841,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35776,26 +35895,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Argibideak"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35803,5 +35950,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35912,9 +36059,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36013,17 +36160,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36654,28 +36818,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36793,6 +36964,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37674,5 +37845,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37680,17 +37851,17 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr ""
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+msgid "Draw lines between points for this layer."
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr ""
@@ -37842,5 +38013,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37848,10 +38019,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37860,5 +38031,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37867,6 +38038,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37875,9 +38046,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38036,71 +38207,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38108,32 +38287,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38168,6 +38341,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38298,30 +38471,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39007,5 +39193,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39022,5 +39208,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39748,17 +39934,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39772,36 +39958,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40423,5 +40605,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41389,4 +41571,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41606,6 +41805,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41852,5 +42051,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42421,5 +42620,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42813,955 +43012,67 @@
 msgstr ""
 
-#~ msgid "Unsaved Changes"
-#~ msgstr "Gorde gabeko aldaketak"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Aldaketa batzuk ez dira gorde. Aldaketak baztertu eta jarraitu?"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Gorde eta irten"
-
-#~ msgid "File could not be found."
-#~ msgstr "Fitxategia ez da aurkitu."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Sartu nodo berriarentzako koordenatuak."
+#~ msgid "unusual tag combination"
+#~ msgstr "ez-ohiko etiketa konbinaketa"
 
 #~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Egin daitezkeen aldaketa kopuru maximoa gainditu duzu, {0} aldaketa egin "
-#~ "dituzu eta maximoa {1} da"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Gatazka guztientzako balioak sartu"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Bateratu edonola"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Bide guztiak hutsik zeuden"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Gatazkak konpondu"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "''{0}'' ezin da hutsik egon"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Nabigatzailean ireki"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-ren online laguntza"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Aukeratu ezazu deskargatzeko zeregin bat gutxienez."
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Gatazkak deskarga egiterakoan"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "{0} orriak kargatzerakoan errorea"
-
-#~ msgid "History of Element"
-#~ msgstr "Elementuaren historia"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Bateratu edonola"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Aukeratu bateratzeko bi nodo gutxienez."
-
-#~ msgid "Create a new map."
-#~ msgstr "Mapa berria sortu"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Aukeraketa bideena soilik izan daiteke."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Bi nodo bakarrik onartzen dira"
-
-#~ msgid "Update Selection"
-#~ msgstr "Aukeraketa eguneratu"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
+#~ "Salbuespenari jaramonik ez deskarga bertan behera geratu delako. "
+#~ "Salbuespena hauxe zen: {0}"
+
+#~ msgid ""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Egungo datu-geruza zerbitzaritik eguneratzen du (berriz deskargatuz "
-#~ "datuak)"
-
-#~ msgid "Update Data"
-#~ msgstr "Datuak eguneratu"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "{0} {1} bakarrik sinkronizatu"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "OSM-ra igo..."
-
-#~ msgid "Conflict detected"
-#~ msgstr "Gatazka detektatua"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Igo aldaketa guztiak OSM-ren zerbitzarira."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
+#~ "Kontuz: Hobespenen berrezartzeak huts egin du. Lehenetsitako hobespenen "
+#~ "fitxategia berrabiaraztean huts egin du: {0}"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Konpondu gabeko gatazkak daude. Lehenengo hauek konpondu behar dituzu."
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "Aldaketa guztiak eskaera bakarrean igo"
-
-#~ msgid "Uploading"
-#~ msgstr "Igotzen"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Aldaketa hauek igo?"
-
-#~ msgid "Jump back."
-#~ msgstr "Salto atzera."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Aurreko markatzailea"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Erreproduzitu aurreko markatzailea."
-
-#~ msgid "Next Marker"
-#~ msgstr "Hurrengo markatzailea"
-
-#~ msgid "Jump forward"
-#~ msgstr "Salto aurrera"
-
-#~ msgid "No data imported."
-#~ msgstr "Ez da daturik inportatu."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Motelago aurrera"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Arazoak deskarga egiterakoan"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Ezin da bilaketarik egin ez delako daturik kargatu."
-
-#~ msgid "Load Selection"
-#~ msgstr "Aukeraketa kargatu"
-
-#~ msgid "Downloading..."
-#~ msgstr "Deskargatzen..."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "{0} kontaktatu..."
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Ezabatu {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Ezabatu {1} {0}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "{0} bidetik erreferentzia ezabatzen"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Bertsio arazoak konpondu {0} {1}-(r)entzat"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "{0} erlaziotik erreferentzia ezabatzen"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ "Kontuz: espero ez zen JOSM bertsioa topatu da berrikusketa artxiboan, "
+#~ "hauxe da topatu duguna: ''{0}''"
+
+#~ msgid ""
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Erlazio ezberdina duten bideak bateratu?"
+#~ "JOSM-k jatorrizko [{0} {1}] datu-multzoan aurkitzea espero zuen, baina ez "
+#~ "da horrela izan. Eman honen berri helbide honetan:http://josm."
+#~ "openstreetmap.de . Hau ez da errore garrantzitsu bat, beraz zure lanean "
+#~ "jarrai dezakezu."
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Aukeratutako bideek erlazio ezberdinak dituzte. Bateratzea nahi al dituzu "
-#~ "hala ere?"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Deskargatu OSM-tik erreferentziak"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Erreferentziak deskargatu..."
+#~ "Kontuz: sarrerako kanala irekitzeko arazoak honekin: ''/data/{0}''. Ezin "
+#~ "izan dugu NTF<->RGF93 sarea kargatu."
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Aukeratutako nodoek erlazio ezberdinak dituzte. Bateratzea nahi al dituzu "
-#~ "hala ere?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Erlazio ezberdina duten nodoak bateratu?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Nodo bakarra aukeratua"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ez dago irekitako dokumenturik beraz ezin da ezer gorde."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+#~ "<html>Bestela, <strong>koadro helbide bat</strong> eman zenezake "
+#~ "<i>zoommaila/x/y</i>, formatuan i.e. <i>15/256/223</i>. Koadro helbideak "
+#~ "honako formatuan <i>zoom,x,y</i> or <i>zoom;x;y</i> erabili daitezke "
+#~ "baita ere..</html>"
+
+#~ msgid ""
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "<html>Ezin izan da \"{0}\" fitxategia irakurri. <br>Akatsa da: <br>{1}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Laguntza orria falta da. Sor ezazu  <A HREF=\"{0}\">English</A>-n  edo <A "
-#~ "HREF=\"{1}\">zure hizkuntza</A>-n."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Por favor, seleccione una o más vías cerradas de al menos cuatro nodos."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Bide honetako adabegirik ez dago beste zerbaiteri lotua."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "KONTUZ: API-aren URL oinarria ezusteko formatuan. Informazio edo Historia "
-#~ "orrirako birbidalketek huts egin dezakete. API-aren URL oinarria \"{0}\" "
-#~ "da"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Nabigatzailearen {0} leiho berri zabaltzeko zorian zaude. <br> Honek zure "
-#~ "pantaila leihoz bete eta amaitzen denbora asko eman dezake."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "''{0}'' parametroa ezin daiteke nulua izan."
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Hautatu datuak geruza berri baten deskargatu behar baldin badira"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Nodoak ezin daitezke batu: Erabiltzen ari den bide bat ezabatu beharko "
-#~ "litzateke."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Mugitu nodoak angelu guztiak 90 edo 270 gradukoak izan daitezen."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Aukera orokorren leihoa ireki."
-
-#~ msgid "Updating primitive"
-#~ msgstr "Jatorrizkoa eguneratzen"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Uneko datu geruzako aldaketa guztiak OSM zerbitzarira igo"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Objektuak aukeratu, mugitu eta errotatu"
-
-#~ msgid "Update selections"
-#~ msgstr "Aukeraketak eguneratu"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Erabili gradu hamartarrak"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Mesedez, sar ezazu -90..90 tartean dagoen latitude bat"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Mesedez, sar ezazu -180..180 tartean dagoen longitude bat"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Aukeraturiko jatorrizko bati erreferentzia egiten dioten jatorrizkoak "
-#~ "deskargatu."
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Beharrezkoa da Id > 0 izatea, {0} jasota"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Pantaila osoko ikuspegia"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Txandakatu pantaila osoko ikuspegia"
-
-#~ msgid "Closed Way"
-#~ msgstr "Itxitako bidea"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Mesedez, sar ezazu baliogarria den longitude bat -180..180 tartean"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Mesedez, sar ezazu baliogarria den latitude bat -90..90 tartean"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "OsmDataLayer edo GpxLayer instantzia espero zen. \"{0}\" Jasoa."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Une honetan azalera bat edo bi besterik ezin dira gehitu."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" ez dagi itxita, beraz, gehitu daiteke."
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Gehitu azalerak: ezabatu bide zidorrak"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Batu itzazu aukeraturiko jatorrizkoak beste geruza batean"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "{0} jatorrizkora"
-#~ msgstr[1] "{0} jatorrizkoetara"
-
-#~ 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] ""
-#~ "Aukeraketak {0} bide dauzka bere baitan. Ziur zaude sinplifikatu nahi "
-#~ "duzula?"
-#~ msgstr[1] ""
-#~ "Aukeraketek {0} bide dauzkate bere baitan. Ziur zaude sinplifikatu nahi "
-#~ "dituzula?"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Ez da objekturik topatu {0} id horrekin erabiltzen ari garen datuen artean"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Aurrera azkarrago"
-
-#~ msgid "Play next marker."
-#~ msgstr "Hurrengo markatzailea erabili."
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Ezabatu diren edo mugitu diren jatorrizkoak"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Arrastatu bidearen segmentu bat errektangulua egiteko. Ctrl-arrastatu "
-#~ "sakatu segmentua bere tokitik mugitzeko."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Mugitu beti eta ez erakutsi berriro elkarrizketa hau"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Mugitu objektuak arrastatuz: Maius. tekla erabili hautaketa berri bat "
-#~ "gehitzeko (Ctrl txandakatzeko); Maius.-Ctrl hautatutakoa biratzeko; edo "
-#~ "hautatutakoa aldatu"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Mesedez, sar ezazu bilaketa kate bat."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Kale Nagusia</b> - 'Nagusia' eta 'Kale' edozein izen edo giltzatan."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Kale Nagusia\"</b> - 'Kale Nagusia' edozein izen edo giltzatan."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>izena:Nag</b> - 'Nag' edozein tokitan izenaren baitan."
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-
-#~ msgid "Missing right parent"
-#~ msgstr "Eskuineko guraso galdua"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Konpondu gabeko gatazkak daude''{0}'' horretan.<br>Lehenengo eta "
-#~ "behin gatazka horiek konpondu beharko.</html>"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Auto-teilakatze azalera gainjarri da"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Mesedez, sar ezazu irazgazki katea."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Badaude {0} jatorrizko zeure datu multzo lokalerean eta "
-#~ "<br>zerbitzarian ezabaturik egon daitezke. Geroago ezabatzen saiatuko "
-#~ "bazina edo <br>berriztatzen saiatuko bazina, zerbitzariak agian hauxe "
-#~ "esango dizu:<br>gatazka.<br><br>Klik egin <strong>{1}</strong>jatorrizko "
-#~ "horien egoera begiratzeko<br>zerbitzarian.<br>Klik egin <strong>{2}</"
-#~ "strong> ez ikusiarena egiteko.<br></html>"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-izena:Nag</b> -  'Nag' hori gabe izenean."
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Bukatu elkarrizketa eta ez sortu nodo berririk"
-
-#~ 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 ""
-#~ "Aukeraturiko bideek eskualdetik deskargatu diren datuetan agertzen ez "
-#~ "diren nodoak dituzte.\n"
-#~ "Honek nodoak nahigabe ezabatzea ekar lezake.\n"
-#~ "Ziur zaude jarraitu nahi duzula?"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Bikoiztu {0} nodo {1} nodoetan"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Klik egin ezabatzeko. Maius teklak: ezabatu bidearen zati bat. Alt: ez "
-#~ "ezabatu erabili gabeko nodoak bide bat ezabatzerakoan. Ctrl:  ezabatu "
-#~ "erreferentziazko objektuak."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Id-aren operadorearen balio okerra: {0}. Zenbaki bat behar genuen."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Nodo operadorearen balio okerra: {0}. Nodo operadoreak nodoen kopuru "
-#~ "zehatza edo bi zenbakien arteko bitartekoa espero du, esate baterako: "
-#~ "10-20"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Erabili <b>\"</b> operadoreen kopurua mugatzeko (adibidez, gitzak hau "
-#~ "baldin badu :)"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Etiketen operadorerako parametro kopuru okerra."
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Etiketen operadorerako balio okerra: {0}. Etiketen operadoreak etiketen "
-#~ "zenbakia espero zuen edo kategoria, esate baterako etiketak:1 edo "
-#~ "etiketak:2-5"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Nodoen opereradorearendako parametro kopuru okerra."
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Aldagai multzoko operadorearen balio okerra: {0}. Zenbaki bat behar "
-#~ "genuen."
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Ezin direktorioa zabaldu.<br>Mesedez hautatu artxibo bat!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Irekitzen {0} artxiboak..."
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Eskuineko parentesia galdua"
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "Operadorearen bertsioaren balio okerra: {0}. Kopurua espero zen."
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} Erlazioek, elkarri egiten diotelako erreferentzia, gurpil zoroa "
-#~ "osatu dute .<br>JOSM programa honek ezin ditu erlazioak kargatu. Mesedez, "
-#~ "editatu erlazioak eta elkarren arteko mendekotasun ziklikoa sortzen "
-#~ "dutenak ezabatu.</html>"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Ezin da ''{0}'' komando hori ezabatu zeren eta  ''{1}''  hori ez da "
-#~ "dagoeneko existitzen"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Kontuz:  ''{0}'' geruza hori ez da dagoeneko existitzen. Ezin da ''{1}'' "
-#~ "jatorrizko horretako gatazka ezabatu."
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Ezabatu \"{0}\"  hori  {1} {2} hauetatik"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "{0} objektu gehitu dira"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html> ''{0}'' geruza horrek badu dagoeneko gatazka bat jatorrizko "
-#~ "honekin<br>''{1}''.<br>Gatazka hau aurrekoari gehi dakioke.</html>"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Deskargatu duzun azalera horretatik kanpo dauden nodoak ezabatzeko zorian "
-#~ "zaude. <br>Honek problemak sor ditzake zeren zeuk (agian) ikusten ez "
-#~ "dituzun objektuek nodo horiek erabiltzen egon litezke<br>Benetan ezabatu "
-#~ "nahi duzu?"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr ""
-#~ "Gutxienez objektu bat beharko duzu ezabatzeko, zeure bilduman ez dago ezer"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "''{0}'' parametroa ezin hutsik egon"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Markatu 'aldatutako' bandera {0} nodorako"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Markatu  {0}={1} hauetan: {2} {3}"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Markatu 'aldatutako' bandera {0} biderako"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Markatu 'aldatutako' bandera {0} erlaziorako"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" itxi gabe dagoenez, ezin dugu lotu"
-
-#~ msgid "Download Object"
-#~ msgstr "Deskargatu objektu hau"
-
-#~ msgid "Download Object..."
-#~ msgstr "Deskargatu objektua..."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr ""
-#~ "Balio negatiboek Mendebaldeko/Hegoaldeko hemisferioa adierazten dute."
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "ID okerra eman da. Ezin da objektua jaitsi"
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Osatugabeko objektuak ezabatzear zaude.<br>Honek arazoak sor ditzake ez "
-#~ "duzulako benetako objektua ikusten.<br>Ezabatzea nahi al dituzu?"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "''{0}'' objektua ezabatua"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Kontuz: ''{0}'' geruza ez da gehiago existitzen. Ezin da jatorrizko "
-#~ "''{1}''-(e)rako gatazka ezabatu"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Berreskuratu jatorrizko {0}(a)"
-#~ msgstr[1] "Berreskuratu jatorrizko {0}(ak)"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "{0} erlaziotik erreferentzia ezabatzen"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Kontuz: {0} bidea ezabatzen nodo kopurua 2tik beherakoa delako. Kopurua "
-#~ "{1}(e)koa da"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Kopiatutako datuek jatorrizko osatugabeak dauzka. Itsastean jatorrizko "
-#~ "osatugabe horiek ezabatu egingo dira. Itsatsi nahi al dituzu datuak "
-#~ "jatorrizko osatugabe horiek gabe?"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr ""
-#~ "Errorea: Espero ez zen ''{0}'' lerroa zerbitzariaren laster-marken "
-#~ "zerrendan"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Errorea: Onartzen ez den  ''{0}''ren balio bikoitza laster-marken "
-#~ "zerrendaren ''{1}'' lerroan"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Graduak Minutuak Segundoak"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Ezin izan dira  ''{0}''ko laster-markak kargatu seguritate "
-#~ "arrazoiengatik. Salbuespena hauxe: {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Galdu egin da {0} ID-a duen objektuaren ageriko helburua"
-
-#~ msgid "standard"
-#~ msgstr "estandarra"
-
-#~ msgid "white"
-#~ msgstr "zuria"
-
-#~ msgid "blue"
-#~ msgstr "urdina"
-
-#~ msgid "red"
-#~ msgstr "gorria"
-
-#~ msgid "gray"
-#~ msgstr "grisa"
-
-#~ msgid "brown"
-#~ msgstr "marroia"
-
-#~ msgid "black"
-#~ msgstr "beltza"
-
-#~ msgid "Amenities"
-#~ msgstr "Zerbitzuak"
-
-#~ msgid "line"
-#~ msgstr "Linea"
-
-#~ msgid "minor_line"
-#~ msgstr "behe-tentsioa"
-
-#~ msgid "tower"
-#~ msgstr "dorrea"
-
-#~ msgid "any substance"
-#~ msgstr "edozein substantzia"
-
-#~ msgid "overground"
-#~ msgstr "lurrazalean"
-
-#~ msgid "underwater"
-#~ msgstr "urperatua"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby-a"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Rugby-a editatu"
-
-#~ msgid "Man-Made"
-#~ msgstr "Gizakiak-eraikia"
-
-#~ msgid "Edit Football"
-#~ msgstr "Futbol amerikarra editatu"
-
-#~ msgid "Football"
-#~ msgstr "Futbol amerikarra"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motor-kirolak"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Motor-kirolak"
-
-#~ msgid "football"
-#~ msgstr "futbola"
-
-#~ msgid "rugby"
-#~ msgstr "errugbia"
-
-#~ msgid "Accomodation"
-#~ msgstr "Ostatuak"
-
-#~ msgid "Travel"
-#~ msgstr "Bidaiak"
-
-#~ msgid "With kiosk"
-#~ msgstr "Kioskoarekin"
-
-#~ msgid "Indipend."
-#~ msgstr "Independientea"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Ibaiko bidearen nodoa"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "alpinismo-xenda nekeza"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "alpinismo-xenda zaila"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "alpinismo-xenda"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "mendi-xenda"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "mendi-xenda zaila"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Gehienezko garaiera (metrotan)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Gehienezko zabalera (metrotan)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Gehienezko luzeera (metrotan)"
-
-#~ msgid "Goods"
-#~ msgstr "Merkantziak"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Erakutsi geo-erreferentziatutako irudiak JOSM-ren hondoan (WMS "
-#~ "zerbitzariak, Yahoo eta abar)"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "OSMren datuen balioztatzaile bat. Datuetan egon daitezkeen akatsez "
-#~ "abisatzen dut eta konponbidea eman ezagunenentzat. Etiketen izenentzat "
-#~ "zuzentzaile-ortografiko bat dauka."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "Copy text   \t\r\n"
-#~ "<html>''{0}'' kapak jadanik konflikto bat du oinarrizko mota "
-#~ "honekin<br>''{1}''.<br>Konflikto hau ezin dugu gehitu.</html>"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Ezin izan dugu lastermarka idatzi.<br>{0}</html>"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Frantzia)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 Ipar Sistema Geodesikoa"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "JOSMn mapa-higigarri bat erakusten dut. \"Tile\"ak karga ditzake "
-#~ "desplazatu daitekeen mapa batentzako eta eguneraketak eskatu."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Utzi beste aplikazioei JOSMra komandoak bidaltzen."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "OpenLayers-eko irudi bat erakusten du hondoan"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Multipoligonoak sortzen ditu klik bakarrarekin, erlazio-kudeatzailearekin "
-#~ "baino errazago."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Mapa-sareta bat hondoko-geruza moduan eskuratzeko aukera"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Batak bestearekiko lerrokatu gabe dauden bikoiztutako bideak"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "GPX fitxategi baten puntuak eta irudiak bateratzeko beste gehigarri bat. "
-#~ "Korrelazioa eman dadin, beharrezkoa da puntu baten \"name\", \"cmt\" "
-#~ "edota \"desc\" atributuak irudi-fitxategiaren izenarekin bat etortzea."
-
-#~ msgid "farmland"
-#~ msgstr "etxaldea"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Aukeratutako lehenetsia(k) kopiatu"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMSaren URL helbidea (lehenetsia)"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMSen gehigarrien hobespenak"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Eman menu-izena eta WMSaren URL helbidea"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMSaren URL helbidea"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "WMS gehigarrien menuan agertzen diren WMS zerbitzarien zerrenda editatu"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>WMS geruza honentzako URL-a<br>\"{0}\"<br>ez da bukatzen ez \"&\"n "
-#~ "ezta \"?\"n ere.<br>Honek zuzena ez den WMS bat eskatzera eraman "
-#~ "gaitzake. Baieztatu ezazu<br>hobespenen konfigurazioa.<br>Hala ere "
-#~ "WMSaren \"tile\"ak jaitsi nahi dituzu?"
-
-#~ msgid "forward"
-#~ msgstr "aurrerantz"
-
-#~ msgid "backward"
-#~ msgstr "atzerantz"
-
-#~ msgid "play/pause"
-#~ msgstr "erreproduzitu/pausatu"
-
-#~ msgid "slower"
-#~ msgstr "polikiago"
-
-#~ msgid "faster"
-#~ msgstr "azkarrago"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Ondoko primitibak ezin izan ditugu helburu primitibara kopiatu "
-#~ "<br>helburu datu taldean ezabatuta daudelako:"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Ezabatutako primitibak batzeak huts egin du"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Salbuespena gertatu da"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Bai, berreskuratu horiek ere bai"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Ez, utzi eragiketa"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Errore bat gertatu da zerbitzariarekin "
-#~ "komunikatzerakoan<br>Detaileak: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Zerbitzariarekin komunikazioak huts egin du"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "ikusgai (zerbitzarian)"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "ezkutuan (zerbitzarian)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Ikusgai egoera:"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Fisikoki ezabatu datu talde lokaletik"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Bertsio lokalaren klon bat mantendu"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Uneotan ez dago doitzeko WMS geruzarik"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Aukeratutako WMS geruzaren kokapena doitu"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Kontuz: WMS zerbitzuaren \"{0}\" URLa ez da '&' edota '?'rekin bukatzen."
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Jaitsi WMS \"tile\"a {0}tik"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "WMS geruza aukeratu"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Mesedez, aukeratu doitu beharreko WMS geruza."
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Bai, garbitu."
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Ezabatu datu taldetik"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Etiketa eta konexio gabeko nodoak"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "GPS arrastoaren % {0} {1}tik"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Bai, berrezarri IDa"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Mapa irristakorra"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "IDa 0ra berrezarri"
-
-#~ msgid "Fix relations"
-#~ msgstr "Erlazioak konpondu"
-
-#~ msgid "create new objects"
-#~ msgstr "objektu berriak sortu"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr ""
-#~ "Ezin dira automatikoki gordetako osm datu hauek irakurri: ({0}) - {1}"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Erroreak daude datuetan. Igo edonola ere?"
+#~ "Konbinatutako elementuen zerrenda. Nire elementuak ordeztuko dituzte "
+#~ "konbinatzeko erabakiak aplikatzen direnean."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Gorde beraien koordinatuak"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Gorde nire koordinatuak"
+
+#~ msgid "Change values?"
+#~ msgstr "Balioak aldatu?"
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 26529)
+++ applications/editors/josm/i18n/po/fi.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:21+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:35+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:35+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ohitetaan virheellinen tiedosto-URL: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Varoitus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametrin ”downloadgps” arvoksi ei kelpaa tiedoston URL eikä nimi."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Jätetään huomiotta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "yhteensopivaa) versiota JOSMista.</li></ul>Lisää tietoa:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Poistu JOSMista"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Jatka, yritä silti"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -390,6 +391,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -416,5 +417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -422,7 +423,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -430,5 +432,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -639,5 +641,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1079,6 +1081,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1229,5 +1231,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1454,6 +1456,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2129,5 +2131,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2446,7 +2448,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Lataa dataa"
@@ -2701,7 +2703,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Jätetään poikkeus huomioimatta koska lataus keskeytettiin. Poikkeus oli: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2836,10 +2837,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3009,5 +3010,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3611,6 +3612,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Epämääräisiä tietoja löytyi. Lähetetäänkö silti?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3660,40 +3661,40 @@
 msgstr "Kohteen {0} muutetut solmut"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Poista \"{0}\" pisteestä \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Poista \"{0}\" polusta \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Poista \"{0}\" relaatiosta \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Aseta {0}={1} pisteelle \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Aseta {0}={1} polulle \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Aseta {0}={1} relaatiolle \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Poista \"{0}\" {1} objektista."
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3821,4 +3822,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Poiston vahvistus"
@@ -4138,9 +4140,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Varoitus: Asetusten alustaminen epäonnistui. Asetustiedostoa ei voitu "
-"palauttaa oletusarvoihin: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4176,7 +4176,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Varoitus: tuntematon JOSMin versionumero versiotiedostossa, arvo on \"{0}\""
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4282,11 +4281,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"Objektia [{0} {1}] ei löytynyt datajoukosta, vaikka sen oletettiin olevan "
-"siellä. Voit ilmoittaa virheen sivulla \"http://josm.openstreetmap.de/\". "
-"Tämä ei ole kriittinen virhe, ja työskentelyä pitäisi voida jatkaa "
-"ongelmitta."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4389,5 +4384,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4406,8 +4401,8 @@
 msgstr "monimonikulmio"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4548,52 +4543,64 @@
 msgstr "WGS84 maantieteellinen"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Varoitus: syötevirran avaus resurssille \"/data/{0}\" epäonnistui. NTF↔RGF93-"
-"ruudukon lataus epäonnistui"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 aluetta (Ranska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1}-{2} astetta)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Korsika)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9-alue (Ranska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lamber-alue (Viro)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4618,81 +4625,101 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 -alue {0} (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveitsi)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Pohjoinen"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Etelä"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Pallonpuolisko"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Réunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guayana RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Ranska (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM-karttajärjestelmä"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4913,45 +4940,45 @@
 msgstr "Tämä testi tarkistaa monimonikulmioiden kelpoisuuden"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Monimonikulmion ulompi polku puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Monimonikulmion tyyli puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Monimonikulmiosuhteen tyyli puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Monimonikulmiota ei ole suljettu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Monimonikulmion sisempi polku on ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Monimonikulmion polut risteävät keskenään"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Monimonikulmion jäsenellä ei ole käyttökelpoista roolia"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Muu kuin polku monimonikulmiossa"
@@ -5226,5 +5253,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5249,5 +5276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5258,5 +5285,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5670,5 +5697,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5738,5 +5765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "tie"
@@ -5744,5 +5771,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5750,10 +5777,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vesiväylä"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "maankäyttö"
@@ -5763,5 +5790,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5775,5 +5802,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5786,5 +5813,5 @@
 msgstr "julkinen liikenne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6147,5 +6174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6256,4 +6283,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6358,5 +6386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6401,11 +6429,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Voit vaihtoehtoisesti antaa yksittäisen ruudun <strong>osoitteen</"
-"strong> muodossa <i>suurennostaso/x/y</i>, esim. <i>15/256/223</i>. "
-"Ruutuosoite voi olla myös muotoa <i>suurennos,x,y</i> tai <i>suurennos;x;y</"
-"i>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6695,9 +6719,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista yhdistelmäkohteista, jotka tulevat korvaamaan omat kohteet, kun "
-"yhdistelyn tulokset toteutetaan."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6943,10 +6965,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Käytä minun koordinaatteja"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Käytä palvelimen koordinaatteja"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7004,6 +7026,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7025,6 +7047,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7431,5 +7453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7677,5 +7699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7889,7 +7911,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "tuntematon"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8153,5 +8205,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8171,5 +8223,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8186,5 +8238,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Lataa valittujen relaatioiden epätäydelliset jäsenet"
@@ -8192,5 +8244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Hae lataamattomat jäsenet"
@@ -8233,5 +8285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8239,5 +8291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8433,5 +8485,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8536,5 +8588,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Käyttäjä"
@@ -9531,5 +9582,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9711,5 +9762,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9853,4 +9904,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Vain omat muutoskokoelmani"
@@ -9863,4 +9915,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Hae muutoskokoelmia käyttäjänimen perusteella"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10125,9 +10183,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10136,13 +10194,13 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10155,18 +10213,19 @@
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Muutetaanko arvot?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10175,5 +10234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10183,5 +10242,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10190,27 +10249,31 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10219,62 +10282,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Valitse relaatio päävalinnasta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10338,8 +10401,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10362,7 +10427,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Ladataan {1} emorelaation {0} vaillinainen lapsirelaatio"
-msgstr[1] "Ladataan {1} emorelaation {0} vaillinaista lapsirelaatiota"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10701,9 +10766,4 @@
 msgstr "Tuonnin aikana todettiin {0} ristiriitaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10744,10 +10804,4 @@
 msgid "Load relation"
 msgstr "Lataa relaatio"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11023,37 +11077,4 @@
 msgstr "Tyyppi"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "tuntematon"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11169,20 +11190,20 @@
 msgstr "Koordinaatit"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Pisteen {0} historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Polun {0} historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Relaation {0} historia"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Päivitä historia palvelimelta"
@@ -11275,6 +11296,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Muutoskokoelma"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11842,8 +11863,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12259,4 +12280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12285,11 +12307,4 @@
 "<html>{0} objektia ei voi lähettää yhdellä kertaa, koska<br>muutoskokoelman "
 "maksimikoko {1} ylittyisi palvelimella ''{2}''.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12367,38 +12382,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Muokkaa väriä"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Oletusarvo"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12409,9 +12424,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12419,26 +12434,26 @@
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12447,8 +12462,8 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12457,12 +12472,12 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12471,10 +12486,10 @@
 msgstr[1] "{0} jälkeä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12484,78 +12499,78 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12564,11 +12579,11 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12576,6 +12591,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12583,27 +12598,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12613,29 +12628,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12739,5 +12754,5 @@
 msgstr "Löytyneet virheet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12747,57 +12762,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13331,10 +13354,10 @@
 msgstr "JPEG-kuvat (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13342,5 +13365,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13349,26 +13372,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Näytä/piilota merkintöjen tekstit ja kuvakkeet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pysäytä äänentoisto, kun kuulet tahdistusmerkkisi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13376,14 +13399,14 @@
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13407,13 +13430,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL oli: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Virhe näytettäessä URL:ia"
@@ -14349,73 +14372,73 @@
 msgstr "Värit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Piirrä suuntanuolet"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Piirrä virtuaalipisteet valintatilassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Piirrä epäaktiiviset tasot eri värillä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Pehmeä karttagrafiikka (antialisointi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14423,9 +14446,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14433,15 +14456,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14452,47 +14511,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Pakota viivojen piirto, jos segmenttejä ei ole."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Piirrä isot GPS-pisteet."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -14500,5 +14551,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14522,5 +14573,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14563,5 +14614,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14575,38 +14626,18 @@
 msgstr "Jalankulku (foot)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14615,10 +14646,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14628,10 +14659,10 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14640,20 +14671,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14661,5 +14692,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14667,14 +14698,14 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14684,13 +14715,13 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14698,27 +14729,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15380,5 +15429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15470,5 +15519,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Nollaa"
@@ -15747,5 +15796,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -16134,5 +16183,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16161,9 +16210,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16447,6 +16496,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16772,5 +16821,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16984,5 +17033,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17381,4 +17430,9 @@
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18205,4 +18259,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18322,4 +18378,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18894,5 +18964,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35193,4 +35263,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35207,6 +35278,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35225,15 +35296,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "tien nimessä lyhenne"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "avain \"oneway\" pisteellä"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "avain \"bridge\" pisteellä"
@@ -35244,12 +35315,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "väärä \"highway\" arvo"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Nimetön tie"
@@ -35258,16 +35329,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "tie ilman tien numeroa"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr ""
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "väärinkirjoitettu avain"
@@ -35277,10 +35348,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "bicycle-merkitty pyörätie"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "''footway'' tagin ''foot'' kanssa"
@@ -35289,10 +35360,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "Pyörätiellä myös pyöräkaista"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Este tien ominaisuutena"
@@ -35301,35 +35372,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "nopeusrajoitus jalkakäytävällä"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "Avaimen layer arvossa \"+\"-merkki"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "kadun nimi sisältää ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relaatio ilman tagia \"type\""
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "nimetön ravintola"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "poikkeuksellinen tagiyhdistelmä"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35434,117 +35514,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-kartat"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kartat (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "Ordnance Survey 7th Series (50-60 -luvun kartat Briteistä)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Tanska)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Tanska)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35789,6 +35879,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Lähetys peruttu"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35890,9 +35980,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35910,23 +36000,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35934,26 +36054,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Tiedot"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35961,6 +36109,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Korjaa osoitteita"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -36070,9 +36218,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36173,17 +36321,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36820,28 +36985,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36960,6 +37132,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37843,5 +38015,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37851,17 +38023,17 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
@@ -38013,5 +38185,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38019,10 +38191,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38031,5 +38203,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38038,6 +38210,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38046,9 +38218,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38207,71 +38379,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38279,32 +38459,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38339,6 +38513,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38469,30 +38643,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39188,5 +39375,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39203,5 +39390,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39935,17 +40122,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39959,36 +40146,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40610,5 +40793,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41579,4 +41762,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41796,6 +41996,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42042,5 +42242,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42611,5 +42811,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42995,2067 +43195,79 @@
 msgstr ""
 
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Syötä arvot kaikille ristiriidoille."
-
-#~ msgid "Closed Way"
-#~ msgstr "Suljettu polku"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Virheellinen objekti (id=0)"
-
-#~ msgid "Preparing..."
-#~ msgstr "Valmistellaan..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Lähetetään..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Virheellinen salasana tai käyttäjänimi."
-
-#~ msgid "Aborting..."
-#~ msgstr "Keskeytetään..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Anna salasana"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Download Area"
-#~ msgstr "Lataa alue"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisää valitut"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "piste"
-#~ msgstr[1] "pisteet"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} piste"
-#~ msgstr[1] "{0} pistettä"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "kuva"
-#~ msgstr[1] "kuvat"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Download List"
-#~ msgstr "Lataa lista"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Välityspalvelimen osoite"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Välityspalvelinasetukset"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyymi"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Välityspalvelimen käyttäjänimi"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Välityspalvelimen portti"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Välityspalvelimen salasana"
-
-#~ msgid "File not found"
-#~ msgstr "Tiedostoa ei löytynyt"
-
-#~ msgid "S"
-#~ msgstr "E"
-
-#~ msgid "N"
-#~ msgstr "P"
-
-#~ msgid "W"
-#~ msgstr "L"
-
-#~ msgid "E"
-#~ msgstr "I"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Downloading..."
-#~ msgstr "Ladataan..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Ole hyvä ja anna nimi sijainnille."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
-
-#~ msgid "Edit new relation"
-#~ msgstr "Muokkaa uutta relaatiota"
-
-#~ msgid "Create new relation"
-#~ msgstr "Luo uusi relaatio"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Muokkaa relaatiota #{0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Jäsenet: {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Tallentamattomia muutoksia. Poistetaanko taso silti?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Yhdistä valittu taso alla olevaan tasoon."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Ratkaise ristiriidat"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Yhdistämisristiriidat"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0}:ssä on {1} jälki"
-#~ msgstr[1] "{0}:ssä on {1} jälkeä"
-
-#~ msgid "Length: "
-#~ msgstr "Pituus: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Ajanjakso: "
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#~ msgid "Read GPX..."
-#~ msgstr "Lue GPX..."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Tahdista kello"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} poistettu)"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM-salasana"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Käytä sisäänrakennettuja oletusarvoja"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versio {1}{2}"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Käytä välityspalvelinta"
-
-#~ msgid "layer not in list."
-#~ msgstr "taso ei ole listassa."
-
-#~ msgid "Set the language."
-#~ msgstr "Aseta kieli."
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Rotate"
-#~ msgstr "Kierrä"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Poista {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Poista {1} {0}"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Ristiriidassa oleva relaatio"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Asteina, minuutteina ja sekunteina"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "File could not be found."
-#~ msgstr "Tiedostoa ei löytynyt."
-
-#~ msgid "gps track description"
-#~ msgstr "gps-jäljen kuvaus"
-
-#~ msgid "Create a new map."
-#~ msgstr "Luo uusi kartta."
-
-#~ msgid "Uploading data"
-#~ msgstr "Lähetetään dataa"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
+#~ msgid "Change values?"
+#~ msgstr "Muutetaanko arvot?"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Lähetys peruttu"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "poikkeuksellinen tagiyhdistelmä"
+
+#~ msgid "Changeset"
+#~ msgstr "Muutoskokoelma"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Käytä palvelimen koordinaatteja"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Käytä minun koordinaatteja"
+
+#~ msgid ""
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten "
-#~ "lähetystä."
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA-tuonti epäonnistui"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Tarkistussummavrihe: "
-
-#~ msgid "Load Selection"
-#~ msgstr "Lataa valinta"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Hitaammin eteenpäin"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Nopeammin eteenpäin"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Sallitut toiminnot"
-
-#~ msgid "change the selection"
-#~ msgstr "vaihda valinta"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Anna haettava merkkijono"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "lähellä"
-
-#~ msgid "Grid"
-#~ msgstr "Ruudukko"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Korjaa valitut virheet"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ohita valitut virheet seuraavalla kerralla."
-
-#~ msgid "Open an other photo"
-#~ msgstr "Avaa toinen kuva"
-
-#~ msgid "All images"
-#~ msgstr "Kaikki kuvat"
-
-#~ msgid "help"
-#~ msgstr "ohje"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Vain kaksi pistettä sallittu"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
+#~ "Objektia [{0} {1}] ei löytynyt datajoukosta, vaikka sen oletettiin olevan "
+#~ "siellä. Voit ilmoittaa virheen sivulla \"http://josm.openstreetmap.de/\". "
+#~ "Tämä ei ole kriittinen virhe, ja työskentelyä pitäisi voida jatkaa "
+#~ "ongelmitta."
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Syötä uuden pisteen koordinaatit."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Valituista pisteistä ei voi muodostaa ympyrää."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid "Split way segment"
-#~ msgstr "Katkaise polku"
+#~ "Jätetään poikkeus huomioimatta koska lataus keskeytettiin. Poikkeus oli: "
+#~ "{0}"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Näytä pisteiden tai polkujen historia."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Valinnan pitää muodostua pelkistä poluista."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Anna asteet desimaalilukuna."
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Monistaa valitut polut."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Monista polku"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Luo kopio polusta"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Datalähteet ja -tyypit"
-
-#~ msgid "to"
-#~ msgstr "-"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ "Varoitus: Asetusten alustaminen epäonnistui. Asetustiedostoa ei voitu "
+#~ "palauttaa oletusarvoihin: {0}"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
-#~ "ja siirtääksesi näkymää."
-
-#~ msgid "x from"
-#~ msgstr "x"
-
-#~ msgid "zoom level"
-#~ msgstr "zoom-taso"
-
-#~ msgid "y from"
-#~ msgstr "y"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Näytä/piilota teksti/kuvakkeet"
-
-#~ msgid "Error during parse."
-#~ msgstr "Virhe jäsennettäessä."
-
-#~ msgid "Commit comment"
-#~ msgstr "Lähetä kommentti"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
+#~ "Varoitus: tuntematon JOSMin versionumero versiotiedostossa, arvo on "
+#~ "\"{0}\""
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Varoitus: liitännäinen {0} oli pyydettyjen listalla, muttei ole enää "
-#~ "tarpeellinen."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Liitännäistä ei löytynyt: {0}."
+#~ "Varoitus: syötevirran avaus resurssille \"/data/{0}\" epäonnistui. "
+#~ "NTF↔RGF93-ruudukon lataus epäonnistui"
 
 #~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
-#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
+#~ "<html>Voit vaihtoehtoisesti antaa yksittäisen ruudun <strong>osoitteen</"
+#~ "strong> muodossa <i>suurennostaso/x/y</i>, esim. <i>15/256/223</i>. "
+#~ "Ruutuosoite voi olla myös muotoa <i>suurennos,x,y</i> tai <i>suurennos;x;"
+#~ "y</i>.</html>"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
-#~ "yritä myöhemmin uudestaan."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
-#~ "virhetilanteeseen."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Esivalintaryhmä ”{0}”"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Tyhjä arvo poistaa avaimen."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Yhdistetään OSM-palvelimeen..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Muokkaa ominaisuuksia"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Tuonnin aikana oli ristiriitoja."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
-#~ "versioon."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Palvelimeen ei voida yhdistää."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Poistetaanko koko taso?"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Päivitä valintalista."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Poista valittu taso."
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "jälki, jossa on {0} piste"
-#~ msgstr[1] "jälki, jossa on {0} pistettä"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "aikavyöhyke-ero: "
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Kirjanmerkkejä ei voitu lukea."
-
-#~ msgid "Keep backup files"
-#~ msgstr "Säilytä varmuuskopiotiedostot"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagien esivalintojen lähteet"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagien esiasetusten lähde"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lataa puuttuvat liitännäiset"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Ladataanko seuraavat liitännäiset?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Virhe poistettaessa liitännäistiedostoa: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Liitännäinen on jo olemassa"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Ladattiin liitännäistiedot {0} sivustolta"
-#~ msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Virhe luettaessa liitännäisten tiedot sisältävää tiedostoa: {0}"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Päivitä seuraavat liitännäiset:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Liitännäistietoja ei löytynyt."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Enimmäispituus (metreissä) pisteiden välisille viivoille. Arvolla -1 "
-#~ "piirretään aina peräkkäisten pisteiden välit."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Kiitos ymmärtyksestäsi!</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Ota huomioon, että pikanäppäimet yhdistetään toimintoihin, kun JOSM "
-#~ "käynnistetään. JOSM pitää siis <b>käynnistää uudelleen</b>, jotta "
-#~ "muutokset tulevat voimaan.</p>"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktivoidaan päivitetyt liitännäiset"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
-#~ "lla on oikeus korvata vanhat tiedostot."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Seuraavissa litännäisissä oli ongelmia:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Päivitä liitännäiset"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Olet aikeissa poistaa pisteitä ladatun alueen ulkopuolelta.<br>Tämä voi "
-#~ "johtaa ongelmiin, koska objektit, joita et näe voivat käyttää niitä."
-#~ "<br>Oletko varma, että haluat poistaa ne?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Valinta \"{0}\" on jäsenenä relaatiossa \"{1}\".\n"
-#~ "Poistetaanko relaatiosta?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Valinta \"{0}\" on jäsenenä {2} relaatiossa \"{1}\".\n"
-#~ "Poistetaanko relaatiosta?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Ratkaise {0} ristiriitaa {1} objektissa"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Virhe jäsennettäessä"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-verkko-ohje"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Tiedostoa \"{0}\" ei voitu nimetä uudelleen."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Lähetetäänkö nämä muutokset?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Varmuuskopion palauttamisessa tapahtui virhe."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Tallennettaessa tapahtui virhe."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Tiedostoa ei voitu varmuuskopioida."
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Tapahtui odottamaton poikkeus.\n"
-#~ "\n"
-#~ "Tämä on aina ohjelmointivirhe. Jos käytät uusinta\n"
-#~ "JOSM:n versiota, ilmoita ohjelmavirheestä."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Valitse tasan kolme pistettä tai polku, jossa on tasan kolme pistettä."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Käytät EPSG:4326-projektiota, joka voi johtaa<br>epätoivottuihin "
-#~ "lopputuloksiin suorakulmaistettaessa.<br>Vaihda projektiota päästäksesi "
-#~ "eroon tästä varoituksesta.<br>Haluatko jatkaa?"
-
-#~ msgid "Jump forward"
-#~ msgstr "Siirry eteenpäin"
-
-#~ msgid "Jump back."
-#~ msgstr "Siirry takaisin"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Monista {0} pistettä {1} pisteeksi"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Älä toteuta muutoksia"
-
-#~ msgid "No data imported."
-#~ msgstr "Dataa ei tuotu."
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Uutta ohjelmavirhettä ei voida luoda. Tulos: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "varmista kaikki etähallinnan toimenpiteet käsin"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#~ msgid "change the viewport"
-#~ msgstr "vaihda näkymä"
-
-#~ msgid "load data from API"
-#~ msgstr "lataa data API:sta"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Asetukset etähallintaliitännäiselle."
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Muokkaa JOSM:n asetuksia."
-
-#~ 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] "Valinnassa on {0} polku. Haluatko varmasti yksinkertaistaa sen?"
-#~ msgstr[1] ""
-#~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
-
-#~ msgid "Boat"
-#~ msgstr "Vene"
-
-#~ msgid "Motorboat"
-#~ msgstr "Moottorivene"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ratsastustie"
-
-#~ msgid "Cycleway"
-#~ msgstr "Pyörätie"
-
-#~ msgid "Footway"
-#~ msgstr "Jalankulkutie"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Laskusilta"
-
-#~ msgid "Station"
-#~ msgstr "Asema"
-
-#~ msgid "Shop"
-#~ msgstr "Kauppa"
-
-#~ msgid "map"
-#~ msgstr "kartta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "pyöräkartta"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Football"
-#~ msgstr "Amerikkalainen jalkapallo"
-
-#~ msgid "football"
-#~ msgstr "amerikkalainen jalkapallo"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Moottoriurheilu"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Johtojen määrä"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Kirjanmerkkiä ei voitu kirjoittaa."
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektilla on ristiriita:"
-#~ msgstr[1] "{0} objektilla on ristiriitoja:"
-
-#~ msgid "Accomodation"
-#~ msgstr "Majoittuminen"
-
-#~ msgid ""
-#~ "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 "
-#~ "kirjoittamista."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-tagi muussa kuin relaatiossa."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Vääränlainen pisteen id"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr ""
-#~ "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
-
-#~ 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 ""
-#~ "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?"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Lataa suoristetun kuvan Metacartan Map Rectifier WMS:stä"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?"
-
-#~ msgid "Occupied By"
-#~ msgstr "Jäsen"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Virhe: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Varoitus: {0}"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Lähetä OSM-palvelimelle..."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Liitännäinen {0} vaikuttaa rikkinäiseltä, tai sitä ei voitu ladata "
-#~ "automaattisesti."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projektio \"{0}\" on suunniteltu käytettäväksi\n"
-#~ "vain leveysasteiden 46.1° ja 57° välillä.\n"
-#~ "Käytä muuta projektiota, jos et käytä\n"
-#~ "ranskalaista WMS-palvelinta.\n"
-#~ "Älä lähetä mitään dataa palvelimelle tämän viestin jälkeen."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Muokkaa sivustoja..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Liitännäispaketti on jo saatavilla. Haluatko ladata uusimman version ja "
-#~ "poistaa nykyisen paketin?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-#~ "uudelleen."
-#~ msgstr[1] ""
-#~ "{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-#~ "uudelleen."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Päättävä sulkumerkki puuttuu."
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Myös polun rooli relaatioissa kopioitiin kaikkiin uusiin polkuihin.\n"
-#~ "Ole hyvä ja tarkista, että jäsenyys ja rooli relaatioissa on oikein, sekä "
-#~ "korjaa tarvittaessa."
-
-#~ msgid "resolved version:"
-#~ msgstr "Ristiriidan ratkaisuksi valittu versio:"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Näytä geo-merkityt kuvat"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} kuvasta löytyi gps-sijaintitiedot."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr ""
-#~ "Tarkistin löysi muutetuista kohteista virheitä tai huomautettavaa. "
-#~ "Lähetetäänkö muutokset silti?"
-
-#~ msgid "Goods"
-#~ msgstr "Pakettiautot (goods)"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS-liitännäisen asetukset"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Muokkaa moottoriurheilun ominaisuuksia"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Poistettu jäsen \"{0}\" relaatiossa."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Muokkaajat: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Tasot: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Komentolista: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Ristiriidat: {0}"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Painting problem"
-#~ msgstr "Piirto-ongelma"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia "
-#~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Raahaa pisteiden välistä yhteyttä piirtääksesi suorakulmion."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Avaa kuvia AgPifoJ:llä..."
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei "
-#~ "ehkä löydy näppäimistöltäsi. Käytä vain näppäimiä, jotka löytyvät "
-#~ "näppäimistöltäsi. Esimerkiksi, jos näppäimistölläsi ei ole Copy-näppäintä "
-#~ "(joka löytyy Sun-koneiden näppäimistöiltä muttei pc-näppäimistöiltä), älä "
-#~ "valitse sitä. Listassa on myös merkkejä, jotka saat näppäinyhdistelmien "
-#~ "takaa: älä käytä niitäkään vaan vain kunkin näppäimen perusmerkitystä. "
-#~ "Esimerkki: ';' on englantilaisella näppäimistöllä yksi näppäin mutta "
-#~ "suomalaisella näppäimistöllä vaihto+\",\" . JOSM ei voi erottaa näitä ja "
-#~ "näiden käyttö voi johtaa väärien toimintojen suorittamiseen.</p>"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Avaa OpenStreetBugs-ikkuna ja aktivoi automaattinen lataus"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Tahdista aika GPS-yksikön kanssa"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>VAROITUS: Salasana on tallennettu asetustiedostoon ilman "
-#~ "minkäänlaista salausta.<br>Salasana lähetetään salaamattomana "
-#~ "palvelimelle URL-osoitteessa.</br><b>Älä käytä arvokasta salasanaa.</b></"
-#~ "html>"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Ei voitu lukea URL:stä: \"{0}\""
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Polkua jonka pisteet eivät ole järjestyksessä, ei voi monistaa."
-
-#~ msgid "Portcullis"
-#~ msgstr "Laskuristikko"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Tämä tarkistaa, jos kaksi polkua, rataa tai vesiväylää risteävät samassa "
-#~ "tasossa, mutteivät ole yhdistettyinä pisteellä."
-
-#~ msgid "optician"
-#~ msgstr "optikko"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Virheelliset avain/arvo-parit"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tagit (tyhjä arvo poistaa tagin)"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Aseta {0}={1} kohteelle {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Aseta {0}={1} kohteelle {2} {3}"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Napsauta poistaaksesi. Shift: poista vain yksi yhteys polusta. Alt: jätä "
-#~ "kaikki pisteet poistettavasta polusta. Ctrl: poista kaikki pistettä "
-#~ "käyttävät polut."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Karttaprojektiota ei löydy ohjelman asetustiedostosta. Käytetään "
-#~ "projektiota EPSG:4326."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on "
-#~ "asennettu."
-
-#~ msgid "Save and Exit"
-#~ msgstr "Tallenna ja poistu"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Omien asetusten hakemistoa {0} ei voi avata."
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Tiedostossa, jossa sijaitsevat omat asetuksesi on virhe. Vanhasta "
-#~ "tiedostosta tehdään varmuuskopio: {0}"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Poista kaikki valitut objektit relaatiosta"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Poista valitut"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Poista taso"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "TÄMÄ ON KOKEELLINEN. Tallenna työsi ja tarkista lopputulos ennen "
-#~ "lähettämistä."
-
-#~ msgid "Download Plugins"
-#~ msgstr "Lataa liitännäiset"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Tee virheilmoitus osoitteessa {0}"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja."
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään {4}: {5} (id: {6})"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Valmistellaan karttatietoja..."
-
-#~ msgid "Login"
-#~ msgstr "Kirjaudu sisään"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Valitse ensin kirjanmerkki."
-
-#~ msgid "Move Down"
-#~ msgstr "Siirrä alaspäin"
-
-#~ msgid "Move Up"
-#~ msgstr "Siirrä ylöspäin"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relaatioeditori: {0}"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Palvelin ei tue muutoskokoelmia"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa "
-#~ "raahaamalla oikealla napilla, valitse alue vetämällä vasemmalla napilla."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Luodaan muutoskokoelma..."
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Ratkaise ristiriita"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Värittää pisteet ja jäljen segmentit paikannuksen tarkkuuden perusteella "
-#~ "(HDOP). Toimii vain jos tarvittava tieto on saatavilla."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Tuntematon rooli \"{0}\""
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Muokkaa laskusillan ominaisuuksia"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Muokkaa laskuristikkoa"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Yhdistä silti"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Yhdistä silti"
-
-#~ msgid "History of Element"
-#~ msgstr "Elementin historia"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä "
-#~ "pistettä."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Valitse ainakin yksi piste, polku tai relaatio. Vain jo aikaisemmin "
-#~ "lähetetyillä elementeillä on historia."
-
-#~ msgid "Public"
-#~ msgstr "Julkinen"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Tämä toiminto vaatii {0} erillistä latauspyyntyöä. Oletko varma, että "
-#~ "haluat jatkaa?"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut "
-#~ "karttatietoja."
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta."
-
-#~ msgid "Full Screen"
-#~ msgstr "Koko näyttö -tila"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Etähallintaliitännäinen odottaa yhteyksiä koneellesi porttiin 8111. Muut "
-#~ "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi "
-#~ "vaihtaa."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Karttatietokantapalvelun URL"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
-#~ "osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr ""
-#~ "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Useita \"via\" -jäseniä."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Ei \"to\"-roolin tietä."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Ei \"from\"-roolin tietä."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Kiellolle {0} ei löydy piirtotyyliä."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
-
-#~ msgid "Update failed"
-#~ msgstr "Päivitys epäonnistui"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Siirstämäsi objektien määrä ylitti {0}. Yleensä tämä on virhe.\n"
-#~ "Oletko varma että haluat siirtää ne?"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikti latauksen aikana"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Nykyinen muutosten määrä ylittää muutosten enimmäismäärän, nykyinen on "
-#~ "{0}, enimmäismäärä on {1}"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>Lähetys <strong>epäonnistui</strong> koska käytit muutoskokoelmaa "
-#~ "{0} joka on suljettu {1}.<br>Ole hyvä ja lähetä muutokset uudestaan joko "
-#~ "uuteen, tai toiseen olemassaolevaan muutoskokoelmaan."
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html><strong>{2}</strong> loi version <strong>{0}</strong> <strong>{1}</"
-#~ "strong> muutoskokoelmassa <strong>{3}</strong></html>"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Avaa uusi muutoskokoelma"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Lähetä data avonaiseen muutoskokoelmaan"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Käytä avonaista muutoskokoelmaa"
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "muutoskokoelman id tulee olla isompi kuin 0. Saatiin {0}"
-
-#~ msgid "changeset id > 0 expected. Got {1}"
-#~ msgstr "muutoskokoelman id tulisi olla isompi kuin 0. Saatiin {1}"
-
-#~ msgid "Open changeset expected. Got closed changeset with id {0}"
-#~ msgstr ""
-#~ "Odotettiin avonaista muutoskokoelmaa. Saatiin suljettu muutoskokoelma {0}"
-
-#~ msgid "current changeset is null. Can't upload data."
-#~ msgstr "nykyinen muutoskokoelma on null. Ei voida lähettää dataa."
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Muutoskokoelmaa ei saatavilla diff-lähetystä varten."
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Muutoskokoelman ''{0}'' sulkeminen epäonnistui OSM-palvelimella "
-#~ "''{1}''.<br>Palvelin sulkee muutoskokoelman automaattisesti aikarajan "
-#~ "umpeuduttua</html>"
-
-#~ msgid "Update Data"
-#~ msgstr "Päivitä data"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Ei voitu lukea tiedostoa ''{0}''.<br> Virhe: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "{0} taso sisältää tallentamattomia muutoksia. Hylkää muutokset ja jatka?"
-#~ msgstr[1] ""
-#~ "{0} tasoa sisältää tallentamattomia muutoksia. Hylkää muutokset ja jatka?"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Lataa viittaavat objektit OSM-palvelimelta..."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Lataa viittaavat objektit..."
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural ""
-#~ "_: gps\n"
-#~ "tracks"
-#~ msgstr[0] "jälki"
-#~ msgstr[1] "jäljet"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-jälki ladattu"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen "
-#~ "jälki."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Valitse, siirrä ja kierrä objekteja"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Ei voitu lukea \"{0}\":aa"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Päivitettäviä objekteja ei valittuna."
-
-#~ msgid "Update Selection"
-#~ msgstr "Päivitä valinta"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Päivittää valitut objektit palvelimelta"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Liitännäinen {0} ei ole saatavilla."
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Lähetä kaikki muutokset yhtenä pyyntönä"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Ladataan objektiin {2} viittaavia objekteja"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Kerroksessa \"{0}\" on ratkaisemattomia konflikteja.<br>Ratkaise ne "
-#~ "ensin.</html>"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Olet avaamassa {0} selainikkunaa.<br>Tämä saattaa täyttää näytön "
-#~ "ikkunoilla<br>ja viedä jonkin verran aikaa."
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ld > 0 vaadittu, saatiin {0}"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Valitse jos tiedot pitäisi ladata uudelle tasolle"
-
-#~ msgid "Update selections"
-#~ msgstr "Päivitä valinnat"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Päivittää nykyisen tietotason objektit palvelimelta."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Lähetä kaikki nykyisessä tietotasossa olevat muutokset OSM-palvelimelle"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Lähetys <strong>epäonnistui</strong>.<br>{0}</html>"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Virheellinen kommentti"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Syötä leveyspiiri väliltä -90–90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Syötä pituuspiiri väliltä -180–180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Sulje ikkuna tekemättä uutta solmua"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Kokoruututila päälle/pois"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Kokoruututila"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää."
-
-#~ msgid "Fix relations"
-#~ msgstr "Korjaa relaatiot"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Päivitä objekti"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Lähetetään {0} objektia..."
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Raahaa segmenttiä luodaksesi suorakulimon. Raahaa ctrl-näppäin pohjassa "
-#~ "siirtääksesi segmenttiä sen normaalin suuntaisesti."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Lisättiin {0} objekttia"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Tietojen lähetys <strong>epäonnistui</strong> koska yritit käyttää "
-#~ "muutoskokoelmaa {0} joka on jo suljettu ({1}).<br>Ole hyvä ja lähetä "
-#~ "muutoksesi uudestaan joko uuteen, tai toiseen avoinna olevaan "
-#~ "muutoskokoelmaan.</html>"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Suljettu"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Avoin"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Lataa ja näytä valittujen objektien historia"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Anna muutoskokoelman ID"
-
-#~ msgid "User name: "
-#~ msgstr "Käyttäjänimi: "
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Avataan {0} tiedostoa..."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Sörnäisten rantatie\"</b> - 'Sörnäisten rantatie' joko avaimessa tai "
-#~ "arvossa"
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Sörn</b> - 'Sörn' missä kohtaa vain nimeä"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Sörnäisten rantatie</b> - 'Sörnäisten' ja 'rantatie' joko avaimessa "
-#~ "tai arvossa"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - avaimen 'type' arvo täsmälleen 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - avaimen 'type' mitä vain. Kokeile myös <b>*=arvo</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Sörn</b> - 'Sörn' ei missään kohtaa nimeä."
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Tagit ({0} konfliktia)"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Ratkaise ristiriidat"
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "Polku {0} ({1} pistettä) merkittiin keskeneräiseksi koska ainakin yksi "
-#~ "sen pisteistä puuttui ladatusta datasta ja on siten myös keskeneräinen."
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Poistetut tai siirretyt objektit"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Muuta valintaa; Siirrä objekteja raahaamalla; Pidä shift-näppäintä "
-#~ "pohjassa lisätäksesi valintaan (ctrl-näppäimellä poistaa valinnasta; "
-#~ "Pyöritä objekteja ctrl ja shift -näppäimet pohjassa raahamalla"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Palauta {0} objektia"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Merkitse relaatio {0} muokatuksi"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Ranska)"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Maksimipituus (metreinä) viivojen piirtoon paikallisista tiedostoista. "
-#~ "Kaikki viivat piirretään jos arvo on '-1'"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" ei ole suljettu, eikä sitä voi siten yhdistää."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
-
-#~ msgid "Download Object"
-#~ msgstr "Lataa objekti"
-
-#~ msgid "Download Object..."
-#~ msgstr "Lataa objekti..."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Tagittomia irrallisia pisteitä"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "L"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "Joudut selvittämään {0} ristiriidan.<br><br>Avaa lista selvittämättömistä "
-#~ "ristiriidoista ja käsittele se."
-#~ msgstr[1] ""
-#~ "Joudut selvittämään {0} ristiriitaa.<br><br>Avaa lista selvittämättömistä "
-#~ "ristiriidoista ja käsittele ne."
-
-#~ msgid "Man-Made"
-#~ msgstr "Keinotekoiset"
-
-#~ msgid "Travel"
-#~ msgstr "Matkailu"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Poistetaan viittaus relaatiosta {0}"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Lapsirelaatio<br>{0}<br>on poistettu palvelimelta. Sitä ei voi "
-#~ "ladata."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "{0} alkioon"
-#~ msgstr[1] "{0} alkioon"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
-#~ "asettaa alkion {0} tunniste nollaksi.<br>Seuraavan lähetyksen yhteydessä "
-#~ "palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko muutos?</"
-#~ "html>"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Kirjoita suodatuslauseke."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Kirjoita hakuehdot."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Sovella myös lapsikohteisiin"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} ristiriita <strong>selvitettiin automaattisesti</strong>, "
-#~ "poistamalla<br>{0} kohde, joka oli poistettu palvelimelta."
-#~ msgstr[1] ""
-#~ "{0} ristiriitaa <strong>selvitettiin automaattisesti</strong>. "
-#~ "poistamalla<br>{0} kohdetta, jotka on jo poistettu palvelimelta."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Korkeintaan kaksi aluetta voidaan yhdistää tällä hetkellä."
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Yhdistettiin itsensä kanssa päällekkäinen alue"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Alueiden yhdistus: Lyhyiden polkujen poisto"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Kopioitu data sisältää keskeneräisiä objekteja. Liitettäessä "
-#~ "keskeneräiset objektit poistetaan. Liitetäänkö data ilman keskeneräisiä "
-#~ "objekteja?"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Lataa kaikki objektit, jotka viittaavat valittuihin objekteihin."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Taso ''{0}'' sisältää jo ristiriidan objektille<br>''{1}''.<br>Tätä "
-#~ "ristiriitaa ei voi lisätä.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Varoitus: Tasoa \"{0}\" ei ole enää olemassa. Objektin \"{1}\" "
-#~ "ristiriitaa ei voi poistaa."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Paikallisessa datajoukossa on {0} objektia, jotka "
-#~ "on<br>mahdollisesti poistettu palvelimelta. Jos yrität "
-#~ "myöhemmin<br>poistaa tai päivittää ne, ilmoittaa palvelin "
-#~ "todennäköisesti<br>ristiriidasta.<br><br>Voit tarkistaa objektien tilan "
-#~ "palvelimelta<br>painamalla <strong>{1}</strong>.<br>Ohita painamalla "
-#~ "<strong>{2}</strong>.<br></html>"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Yhdistä valitut objektit toiselle tasolle"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Palauta {0} objekti"
-#~ msgstr[1] "Palauta {0} objektia"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Datajoukossa on vielä {0} objekti, johon viitataan<br>palvelimelta "
-#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
-#~ msgstr[1] ""
-#~ "Datajoukossa on vielä {0} objektia, joihin viitataan<br>palvelimelta "
-#~ "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}"
-#~ "<br>datajoukosta.<br>Toteutetaanko muutos?</html>"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Valitse tämän käyttäjän lähettämät objektit"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Virhe poistettujen objektien yhdistämisessä"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Seuraavia objekteja ei voitu kopioida lähdejoukosta, koska<br>\r\n"
-#~ "ne on poistettu kohteena olevasta datajoukosta:"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
-#~ "asettaa objektin {0} tunniste nollaksi.<br>Seuraavan lähetyksen "
-#~ "yhteydessä palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko "
-#~ "muutos?</html>"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Palautetaanko riippuvaiset objektit?"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr "Näytä muutoskokoelmaan kuuluvat objektit aktiiviselta datatasolta"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin objekteihin"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Useat jäsenet viittaavat samaan objektiin"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Relaatiossa on jo ainakin yksi jäsen, joka viittaa<br>objektiin "
-#~ "''{0}''<br><br>Lisätäänkö uusi jäsen silti relaatioon?</html>"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Näytä merkityt objektit aktiiviselta datatasolta"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen valitun "
-#~ "jäsenen edelle"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen valitun "
-#~ "jäsenen perään"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen jäsenen "
-#~ "edelle"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen jäsenen "
-#~ "perään"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Objektilla <br>''{1}''<br>on jo ristiriita tasolla ''{0}''."
-#~ "<br>Selvitä ensin aiempi ristiriita, ja yritä sitten uudelleen.</html>"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Olet antamassa tyhjän roolin {0} objektille."
-#~ msgstr[1] "Olet antamassa tyhjän roolin {0} objektille."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Se vastaa roolin poistamista näiltä objekteilta."
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Valitse ne relaatiojäsenet, jotka viittaavat nykyisessä valinnassa "
-#~ "oleviin objekteihin"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Valitse relaatiojäsenet, jotka viittaavat {0} nykyisessä valinnassa "
-#~ "olevaan objektiin"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Valitse objektit, joihin valitut relaatiojäsenet viittaavat"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Varoitus: objekti \"{0}\" on jo poistettu palvelimelta. Se ohitetaan, ja "
-#~ "koetetaan jatkaa lähetystä."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Palvelimelta saatiin virhekoodi 404, joten yritetään lähettää kaikki "
-#~ "objektit yksitellen."
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Valmistellaan lähetettävät objektit..."
-
-#~ msgid "Errors during Download"
-#~ msgstr "Virheitä latauksen aikana"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Virheellinen tunnus. Kohdetta ei voi ladata."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Poistettavana on keskeneräisiä kohteita.<br>Siitä seuraa ongelmia, koska "
-#~ "todellista kohdetta ei näy.<br>Poistetaanko ne silti?"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Huomio: polku {0} tuhottiin, koska sille oli jäänyt alle kaksi solmua "
-#~ "(tarkalleen {1})."
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Virhe: Odottamaton rivi \"{0}\" palvelimen kirjanmerkkilistassa"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Virhe: Virheellinen double-liukuluku \"{0}\" palvelimen "
-#~ "kirjanmerkkilistan rivillä \"{1}\""
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Kirjanmerkkien lataus URLista \"{0}\" epäonnistui turvallisuussyistä. "
-#~ "Virhe oli: {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Kohteelta numero {0} puuttuu yhdistämiskohde"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Kirjanmerkkejä ei voitu kirjoittaa.<br>{0}</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. "
-#~ "Aiheuttanee uudelleenohjauksen toimimattomuutta OSM-alkioiden tieto- tai "
-#~ "historiasivuile. Sovellusrajapinnan URL-perusosoite on \"{0}\""
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Kohde tyyppiä {0} tunnuksella {1} oli merkitty poistettavaksi, mutta se "
-#~ "puuttuu lähdetiedoista"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr ""
-#~ "Automaattisesti tallennettun osm-tiedon lukeminen ei onnistu ({0}) - {1}"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Ristiriita 'visible' (näkyvä) attribuutissa kohteelle jonka tyyppi on {0} "
-#~ "ja tunniste {1}"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM löysi {0} tallentamatonta osm tietotasoa. Näyttäisi että JOSM kaatui "
-#~ "viimeksi. Haluatko palauttaa tiedot?"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Kohde \"{0}\" pyyhittiin"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Valitse ainakin kaksi yhdistettävää pistettä, tai piste joka on lähellä "
-#~ "toista pistettä."
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Projektiota \"{0}\" ei löytynyt"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "Älä käytä relaatiota osoitteille (vaan lisää kohteisiin \"addr:street\")."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Antaa käyttäjälle mahdollisuuden luoda erilaisia väriteemoja ja vaihdella "
-#~ "niiden välillä. Muuta värejä ja luo uusi teema. Käytetty vaihtamaan "
-#~ "valkoiseen taustaan ja siihen sopiviin väreihin, jotka näkyvät paremmin "
-#~ "kirkkaalla päivänvalolla. Katso JOSMin asetuksista \"Kartta-asetukset"
-#~ "\" (outoa mutta totta :-))."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Annettu linkki tai tunniste ei täsmää valitun palvelun kanssa. Yritä "
-#~ "uudestaan."
+#~ "Lista yhdistelmäkohteista, jotka tulevat korvaamaan omat kohteet, kun "
+#~ "yhdistelyn tulokset toteutetaan."
+
+#~ msgid "Fix adresses"
+#~ msgstr "Korjaa osoitteita"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Epämääräisiä tietoja löytyi. Lähetetäänkö silti?"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 26529)
+++ applications/editors/josm/i18n/po/fr.po	(revision 26530)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-25 17:19+0000\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-11 11:48+0000\n"
 "Last-Translator: Casiope <Unknown>\n"
 "Language-Team: Fr <>\n"
@@ -15,11 +15,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:43+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:43+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 "X-Poedit-Language: French\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -34,12 +34,12 @@
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "L’adresse Web du fichier n’est pas valide, elle est ignorée : ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+msgstr "L’adresse web du fichier n’est pas valide, elle est ignorée : ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -76,10 +76,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -94,6 +94,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -117,16 +118,16 @@
 msgstr "Avertissement"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
-"Le paramètre \"downloadgps\" n’accepte ni les noms ni les adresses Web de "
+"Le paramètre \"downloadgps\" n’accepte ni les noms ni les adresses web de "
 "fichiers."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "L’adresse Web n’est pas valide, elle est ignorée : ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+msgstr "L’adresse web n’est pas valide, elle est ignorée : ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "ancienne version de JOSM (compatible Java 5).</li></ul>Plus d’informations :"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Quitter JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Continuer, essayer quand même"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -328,5 +329,5 @@
 "page for OSM object will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"Attention : le format de l’adresse Web est inattendu. La redirection vers "
+"Attention : le format de l’adresse web est inattendu. La redirection vers "
 "l’historique de l’objet échouera probablement. L’adresse Web est : ''{0}''"
 
@@ -337,5 +338,5 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"Attention : le format de l’adresse Web est inattendu. La redirection vers la "
+"Attention : le format de l’adresse web est inattendu. La redirection vers la "
 "page de l’utilisateur échouera probablement. L’adresse Web est : ''{0}''"
 
@@ -389,6 +390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -415,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -421,7 +422,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -429,5 +431,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -501,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 msgid "Add a node by entering latitude and longitude."
-msgstr "Ajouter un nœud en précisant une latitude et une longitude"
+msgstr "Ajouter un nœud en indiquant sa latitude et sa longitude"
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -638,5 +640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -773,5 +775,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
-msgstr "Téléchargement des groupes de modifications ouverts..."
+msgstr "Téléchargement des groupes de modifications ouverts…"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1081,6 +1083,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1155,5 +1157,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:38
 msgid "Continues drawing a line that shares nodes with another line."
-msgstr "Continuer le chemin avec les nœuds d’un autre chemin."
+msgstr "Continuer le chemin avec les nœuds d’un autre chemin"
 
 #: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:40
@@ -1175,5 +1177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:392
 msgid "Export to GPX..."
-msgstr "Exporter en GPX"
+msgstr "Exporter au format GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
@@ -1231,5 +1233,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1277,5 +1279,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Afficher les informations sur les nœuds, chemins ou relations."
+msgstr "Afficher les informations des nœuds, chemins ou relations"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
@@ -1285,5 +1287,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
 msgid "Joins areas that overlap each other"
-msgstr "Joindre des zones qui se superposent"
+msgstr "Joindre les zones qui se superposent"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:320
@@ -1446,5 +1448,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:61
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "Vous pouvez aussi coller une adresse Web depuis www.openstreetmap.org"
+msgstr "Vous pouvez aussi coller une adresse web depuis www.openstreetmap.org"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:87
@@ -1463,8 +1465,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
-msgstr "Adresse Web"
+msgstr "Adresse web"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:99
@@ -1514,9 +1516,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141
 msgid "Visit Homepage"
-msgstr "Site Web"
+msgstr "Site web"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:152
 msgid "WMS URL or Image ID:"
-msgstr "Adresse Web du service WMS ou identifiant de l’image :"
+msgstr "Adresse web du service WMS ou identifiant de l’image :"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:156
@@ -1533,5 +1535,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
 msgid "No valid WMS URL or id"
-msgstr "Pas d’adresse Web WMS valide ou d’identifiant"
+msgstr "Identifiant ou adresse web non valide"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
@@ -1633,5 +1635,5 @@
 #, java-format
 msgid "Move objects {0}"
-msgstr "Déplacer les objets {0}"
+msgstr "Déplacer la sélection {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:64
@@ -1643,5 +1645,5 @@
 #, java-format
 msgid "Moves Objects {0}"
-msgstr "Déplacer les objets {0}"
+msgstr "Déplacer la sélection {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
@@ -1717,5 +1719,5 @@
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Ouverture d’{0} fichier..."
+msgstr[0] "Ouverture d’{0} fichier…"
 msgstr[1] "Ouverture de {0} fichiers..."
 
@@ -1733,13 +1735,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open an URL."
-msgstr "Ouvrir une adresse Web"
+msgstr "Ouvrir une adresse web"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:78
 msgid "Enter URL to download:"
-msgstr "Entrez l’adresse Web pour télécharger :"
+msgstr "Entrez l’adresse web de téléchargement :"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:80
 msgid "Enter an URL from where data should be downloaded"
-msgstr "Entrer l’adresse Web depuis laquelle les données seront téléchargées"
+msgstr "Entrer l’adresse web depuis laquelle les données seront téléchargées"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -1749,5 +1751,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
 msgid "Download URL"
-msgstr "Télécharger l’adresse Web"
+msgstr "Télécharger l’adresse web"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
@@ -1927,5 +1929,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 msgid "Forget objects but do not delete them on server when uploading."
-msgstr "Oublier les objets mais ne pas les supprimer du serveur durant l’envoi"
+msgstr "Oublier la sélection sans la supprimer durant l’envoi"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:62
@@ -1945,5 +1947,5 @@
 msgstr ""
 "JOSM va oublier les objets sélectionnés.<br> Ils seront effacés du calque, "
-"mais <i>pas</i><br>supprimés du serveur après l’envoi."
+"mais <i>pas</i> supprimés du serveur lors de l’envoi."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:229
@@ -1951,7 +1953,5 @@
 "The following dependent objects will be purged<br> in addition to the "
 "selected objects:"
-msgstr ""
-"Les objets dépendants suivants seront purgés<br>en plus des objets "
-"sélectionnés :"
+msgstr "Les objets dépendants suivants seront aussi oubliés :"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:260
@@ -1969,5 +1969,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280
 msgid "Clear Undo/Redo buffer"
-msgstr "Effacer le cache Annuler/Répéter"
+msgstr "Effacer le cache Annuler / Répéter"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -2138,5 +2138,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2455,7 +2455,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Télécharger les données."
@@ -2560,5 +2560,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:122
 msgid "Validating"
-msgstr "Validation..."
+msgstr "Validation…"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:166
@@ -2712,7 +2712,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"L’exception est ignorée car le téléchargement a été annulé. Exception : {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2849,10 +2848,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3022,5 +3021,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3090,6 +3089,6 @@
 "Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
 msgstr ""
-"Déplacer les objets en glissant. Maj pour ajouter à la sélection. Maj+Ctrl "
-"pour faire pivoter la sélection. Alt+Ctrl pour étendre la sélection."
+"Glisser pour déplacer la sélection. Maj pour ajouter à la sélection. Maj"
+"+Ctrl pour faire pivoter la sélection. Alt+Ctrl pour étendre la sélection."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
@@ -3256,5 +3255,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - recherche tous les objets modifiés par l’utilisateur"
+msgstr "<b>user:</b>… - recherche tous les objets modifiés par l’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
@@ -3275,6 +3274,6 @@
 "assigned version)"
 msgstr ""
-"<b>version:</b>... - recherche l’objet avec la version indiquée (<b>0</b> "
-"pour les objets sans version)"
+"<b>version:</b>… - recherche l’objet avec la version indiquée (<b>0</b> pour "
+"les objets sans version)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
@@ -3283,5 +3282,5 @@
 "assigned changeset)"
 msgstr ""
-"<b>changeset:</b>... - recherche l’objet avec l’identifiant du groupe de "
+"<b>changeset:</b>… - recherche l’objet avec l’identifiant du groupe de "
 "modifications indiqué (<b>0</b> pour les objets sans groupe de modifications)"
 
@@ -3291,6 +3290,6 @@
 "min-max)"
 msgstr ""
-"<b>nodes:</b>... - recherche l’objet avec le nombre indiqué de nœuds "
-"(<b>nodes:total</b> ou <b>nodes:min-max</b>)"
+"<b>nodes:</b>… - recherche l’objet avec le nombre indiqué de nœuds (<b>nodes:"
+"total</b> ou <b>nodes:min-max</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
@@ -3299,5 +3298,5 @@
 "max)"
 msgstr ""
-"<b>tags:</b>... - recherche l’objet avec le nombre d’attributs indiqué "
+"<b>tags:</b>… - recherche l’objet avec le nombre d’attributs indiqué "
 "(<b>tags:total</b> ou <b>tags:min-max</b>)"
 
@@ -3305,5 +3304,5 @@
 msgid "<b>role:</b>... - object with given role in a relation"
 msgstr ""
-"<b>role:</b>... - recherche l’objet avec le rôle indiqué dans une relation"
+"<b>role:</b>… - recherche l’objet avec le rôle indiqué dans une relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
@@ -3312,5 +3311,5 @@
 "(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
-"<b>timestamp:</b>... - recherche l’objet possédant l’horodatage indiqué "
+"<b>timestamp:</b>… - recherche l’objet possédant l’horodatage indiqué "
 "(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> ou <b>T14:51</b>)"
 
@@ -3320,5 +3319,5 @@
 "(areasize:MIN-MAX or areasize:MAX)"
 msgstr ""
-"<b>areasize:</b>... -  recherche les chemins fermés avec une aire comprise "
+"<b>areasize:</b>… -  recherche les chemins fermés avec une aire comprise "
 "entre MIN et MAX m². (<b>areasize:MIN-MAX</b> ou <b>areasize:MAX</b>)"
 
@@ -3591,5 +3590,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
 msgid "... refers to relation"
-msgstr "… se réfère à la relation"
+msgstr "…se réfère à la relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
@@ -3646,7 +3645,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr ""
-"Des données suspectes ont été trouvées. Voulez-vous continuer l’envoi ?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3696,40 +3694,40 @@
 msgstr "Nœuds changés parmi {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Supprimer ''{0}'' du nœud ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Supprimer ''{0}'' du chemin ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Supprimer ''{0}'' de la relation ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Définir {0}={1} pour le nœud ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Définir {0}={1} pour le chemin ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Définir {0}={1} pour la relation ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Retirer ''{0}'' pour {1} objets"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3860,4 +3858,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Confirmer la suppression"
@@ -4180,9 +4179,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Attention : l’initialisation des préférences a échoué. Impossible de "
-"rétablir le fichier des préférences par défaut : {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4218,8 +4215,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Attention : le numéro de version de JOSM dans le fichier de révision est "
-"inattendu, la valeur est ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4326,10 +4321,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM ne s’attendait à trouver ici les objets [{0} {1}]. Veuillez le "
-"rapporter sur http://josm.openstreetmap.de . Néanmoins, ce n’est pas une "
-"erreur critique. Vous pouvez continuer à travailler en toute sécurité."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4348,4 +4340,6 @@
 "in the source dataset"
 msgstr ""
+"L’objet de type {0} avec l’identifiant {1}  a été marqué comme supprimé mais "
+"il est manquant dans le jeu de données."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247
@@ -4432,5 +4426,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4449,8 +4443,8 @@
 msgstr "multipolygone"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4603,52 +4597,64 @@
 msgstr "WGS 84"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Attention : l’ouverture du flux d’entré pour la ressource \"/data/{0}\" a "
-"échoué. Impossible de charger le réseau NTF<->RGF93."
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 zones (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1}° à {2}°)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corse)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Zone :"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert 9 zones (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert (Estonie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4677,81 +4683,101 @@
 "modifier les préférences pour correspondre avec le code ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Pologne)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Zone PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Pologne)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Pologne)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grille (Suisse)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Lettonie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Zone UTM :"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Nord :"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Sud"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Hémisphère :"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Décalage 3 000 000m Est :"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Réunion GR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM France (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "Système géodésique UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4864,5 +4890,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:207
 msgid "Mixed type duplicated nodes"
-msgstr "Nœuds de plusieurs types dupliqués"
+msgstr "Nœuds dupliqués de plusieurs types"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:218
@@ -4972,45 +4998,45 @@
 msgstr "Vérifier si les multipolygones sont valides."
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Le chemin délimitant la surface n’est pas fermé"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Aucun chemin intérieur pour le multipolygone"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Pas de style pour un multipolygone"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Pas de style dans une relation multipolygone"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Le style du chemin intérieur est égal à \"multipolygon\""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Les styles des chemins extérieurs ne correspondent pas"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Le multipolygone n’est pas fermé"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Le chemin intérieur du multipolygone est à l’extérieur"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Intersection entre les chemins du multipolygone"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Membre du multipolygone sans rôle utile"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Non-chemin dans le multipolygone"
@@ -5285,5 +5311,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5308,5 +5334,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5317,5 +5343,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5342,5 +5368,5 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
-"Les sources (adresse Web ou nom de fichier) du vérificateur orthographique "
+"Les sources (adresse web 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 d’attributs."
@@ -5450,5 +5476,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:105
 msgid "More than one \"from\" way found"
-msgstr "Plus d’un chemin \"from\" a été trouvé"
+msgstr "Il y a plus d’un chemin \"from\""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:108
@@ -5729,5 +5755,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5796,5 +5822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "route"
@@ -5802,5 +5828,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5808,10 +5834,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "cours d’eau"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "Terrain"
@@ -5821,5 +5847,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5833,5 +5859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5844,5 +5870,5 @@
 msgstr "transport public"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6004,6 +6030,6 @@
 "filename"
 msgstr ""
-"Tout télécharger. Peut être sous la forme \"x1,y1,x2,z2\" ou une adresse Web "
-"avec lat=y&lon=x&zoom=z ou encore un nom de fichier."
+"Télécharger. Peut être sous la forme \"x1,y1,x2,z2\" ou une adresse web avec "
+"lat=y&lon=x&zoom=z ou encore un nom de fichier."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
@@ -6013,5 +6039,5 @@
 msgstr ""
 "Télécharger en données GPS brutes. Peut être sous la forme x1,y1,x2,y2 ou "
-"une adresse Web avec lat=y&lon=x&zoom=z ou encore un nom de fichier."
+"une adresse web avec lat=y&lon=x&zoom=z ou encore un nom de fichier."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
@@ -6021,5 +6047,5 @@
 msgstr ""
 "Les ajouter à la sélection. Cela peut être une chaîne de caractères ou une "
-"adresse Web osm-xml"
+"adresse web osm-xml"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:63
@@ -6065,5 +6091,5 @@
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
-"Télécharger le lieu se rapportant à l’adresse Web (avec lat=x&lon=y&zoom=z)"
+"Télécharger le lieu se rapportant à l’adresse web (avec lat=x&lon=y&zoom=z)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
@@ -6080,5 +6106,5 @@
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
-"Télécharger le lieu se rapportant à l’adresse Web (avec lat=x&lon=y&zoom=z) "
+"Télécharger le lieu se rapportant à l’adresse web (avec lat=x&lon=y&zoom=z) "
 "en données GPS brutes"
 
@@ -6145,5 +6171,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:219
 msgid "Updating plugins..."
-msgstr "Mise à jour des greffons..."
+msgstr "Mise à jour des greffons…"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224
@@ -6217,5 +6243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6291,5 +6317,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The geographic longitude at the mouse pointer."
-msgstr "Longitude géographique au niveau du pointeur"
+msgstr "Longitude"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
@@ -6299,5 +6325,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The geographic latitude at the mouse pointer."
-msgstr "Latitude géographique au niveau du pointeur"
+msgstr "Latitude"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
@@ -6323,7 +6349,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:327
 msgid "(no object)"
-msgstr "(aucun objet)"
+msgstr "(aucune sélection)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6430,5 +6457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6473,10 +6500,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Sinon vous pouvez préciser <strong>l’adresse d’une tuile</strong> au "
-"format <i>niveau de zoom/x/y</i>, par exemple <i>15/256/223</i>. Les formats "
-"<i>zoom,x,y</i> et <i>zoom;x;y</i> sont aussi valides.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6713,5 +6737,5 @@
 #, java-format
 msgid "{0} more..."
-msgstr "{0} suivants..."
+msgstr "{0} suivants…"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:323
@@ -6770,9 +6794,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Liste des éléments fusionnés. Ils remplaceront mes éléments lorsque les "
-"décisions de fusion seront appliquées."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -7019,10 +7041,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Conserver mes coordonnées"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Conserver leurs coordonnées"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7081,6 +7103,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7102,6 +7124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7276,5 +7298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:391
 msgid "To ..."
-msgstr "Vers..."
+msgstr "Vers…"
 
 #. minimum size is relevant for multisplit layout
@@ -7481,5 +7503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:415
 msgid "Open a web page for each selected changeset"
-msgstr "Ouvrir le groupe de modifications dans une page Web"
+msgstr "Afficher le groupe de modifications dans une page web"
 
 #. Strings in JFileChooser
@@ -7514,5 +7536,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7755,5 +7777,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7969,7 +7991,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "inconnu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8158,5 +8210,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:599
 msgid "URL:"
-msgstr "Adresse Web :"
+msgstr "Adresse web :"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:601
@@ -8233,5 +8285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8253,5 +8305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8268,5 +8320,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Télécharger les membres incomplets de la relation"
@@ -8274,5 +8326,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Télécharger les membres incomplets"
@@ -8315,5 +8367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8321,5 +8373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8389,5 +8441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
 msgid "Launches a browser with information about the user"
-msgstr "Ouvrir un navigateur avec les informations sur cet utilisateur"
+msgstr "Afficher le profil de cet utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
@@ -8405,5 +8457,5 @@
 "this system.</html>"
 msgstr ""
-"<html>Impossible de créer l’adresse Web, car l’encodage ''{0}''<br>n’est pas "
+"<html>Impossible de créer l’adresse web, car l’encodage ''{0}''<br>n’est pas "
 "disponible sur ce système.</html>"
 
@@ -8420,7 +8472,5 @@
 "Loads information about relicensing status from the server. Users having "
 "agreed to the new contributor terms will show a green check mark."
-msgstr ""
-"Afficher les informations sur le statut de la nouvelle licence. Les "
-"utilisateurs ayant accepté les nouvelles conditions seront marqués."
+msgstr "Afficher les informations sur le statut de la nouvelle licence.."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
@@ -8519,5 +8569,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8620,5 +8670,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Utilisateur"
@@ -8644,10 +8693,10 @@
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) Téléchargement du groupe de modifications {2}..."
+msgstr "({0}/{1}) Téléchargement du groupe de modifications {2}…"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) Téléchargement du contenu du groupe de modifications {2}..."
+msgstr "({0}/{1}) Téléchargement du contenu du groupe de modifications {2}…"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -9616,5 +9665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9796,5 +9845,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9942,4 +9991,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Seulement ceux que je possède"
@@ -9952,4 +10002,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Seulement ceux de l’utilisateur suivant"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10172,9 +10228,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr "Depuis une adresse Web"
+msgstr "Depuis une adresse web"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
 msgid "Query changesets from a server URL"
-msgstr "Télécharger depuis l’adresse Web d’un serveur"
+msgstr "Télécharger depuis l’adresse web d’un serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
@@ -10199,9 +10255,9 @@
 msgid "Please enter a valid changeset query URL first."
 msgstr ""
-"Entrez une adresse Web de requête valide pour le groupe de modifications."
+"Entrez une adresse web de requête valide pour le groupe de modifications."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr "Cette adresse Web est erronée"
+msgstr "Cette adresse web est erronée"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
@@ -10220,14 +10276,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr "Récupérer et télécharger les groupes de modifications..."
+msgstr "Récupérer et télécharger les groupes de modifications…"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr "Adresse Web : "
+msgstr "Adresse web : "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
 msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
 msgstr ""
-"Veuillez entrer une adresse Web pour télécharger les groupes de "
+"Veuillez entrer une adresse web pour télécharger les groupes de "
 "modifications."
 
@@ -10242,16 +10298,16 @@
 "regardless of the host, port and path of the URL entered below."
 msgstr ""
-"Les requêtes des groupes de modifications sont toujours transmises à "
-"''{0}'', peu importe l’hôte, le port et l’adresse Web entrée."
+"Les requêtes sont toujours transmises à l’adresse ''{0}'', peu importe "
+"l’hôte, le port et l’adresse enregistrés."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr "Cette adresse Web n’est pas valide"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+msgstr "Cette adresse web n’est pas valide"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Ajouter des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10260,13 +10316,13 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "une valeur vide supprime l’attribut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10279,18 +10335,19 @@
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Modifier les valeurs"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Remplacer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10299,5 +10356,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10307,5 +10364,5 @@
 msgstr[1] "Modifier les propriétés de {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10314,27 +10371,31 @@
 msgstr[1] "Cette action modifiera {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Sélectionnez une clé :"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Sélectionnez une valeur :"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Sélectionnez les objets dont vous voulez modifier les attributs."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Afficher les propriétés de la sélection"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10343,64 +10404,64 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Position"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Attributs : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Attributs / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Modifier la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Voulez-vous vraiment supprimer la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Supprimer des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifier la valeur de la clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Afficher le wiki sur la balise"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Afficher le wiki d’aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Sélectionner la relation dans la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
-msgstr ""
+msgstr "Sélectionner les membres de la relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:175
@@ -10464,11 +10525,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Attention : l’exception est ignorée car la tâche a été annulée. Exception : "
-"{0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10476,6 +10537,6 @@
 msgid "Downloading {0} incomplete object"
 msgid_plural "Downloading {0} incomplete objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Téléchargement de {0} objet incomplet."
+msgstr[1] "Téléchargement de {0} objets incomplets."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100
@@ -10490,7 +10551,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Téléchargement d’{0} enfant incomplet de {1} relations parentes"
-msgstr[1] "Téléchargement de {0} enfants incomplets de {1} relations parentes"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10501,5 +10562,5 @@
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr "({0}/{1}) : téléchargement de la relation ''{2}''..."
+msgstr "({0}/{1}) : téléchargement de la relation ''{2}''…"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:170
@@ -10836,11 +10897,4 @@
 msgstr "Il y a eu {0} conflits lors de l’importation."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Attention : l’exception est ignorée car la tâche a été annulée. Exception : "
-"{0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10881,12 +10935,4 @@
 msgid "Load relation"
 msgstr "Charger la relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Attention : l’exception est ignorée car la tache a été annulée. Exception : "
-"{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10981,5 +11027,5 @@
 "area)"
 msgstr ""
-"Adresse Web d’openstreetmap.org (collez ici l’adresse Web de la zone à "
+"Adresse web d’openstreetmap.org (collez ici l’adresse de la zone à "
 "télécharger) :"
 
@@ -11009,5 +11055,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
-msgstr "Coller l’adresse Web contenue dans le presse-papier"
+msgstr "Coller l’adresse web contenue dans le presse-papier"
 
 #. adding the download tasks
@@ -11115,5 +11161,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
 msgid "Null pointer exception, possibly some missing tags."
-msgstr "Exception NullPointer. Il manque sans doute des attributs."
+msgstr "Exception NullPointer. Des attributs sont probablement manquants."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:287
@@ -11131,5 +11177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:362
 msgid "Querying name server ..."
-msgstr "Récupération du serveur de noms..."
+msgstr "Récupération du serveur de noms…"
 
 #. Strings in JFileChooser
@@ -11170,37 +11216,4 @@
 msgstr "Type"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "inconnu"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11253,16 +11266,15 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
-"<html>L’ouverture de la page d’aide à l’adresse Web {0} a échoué.<br>Cela "
-"est du à un problème de réseau, veuillez vérifier<br>votre connexion "
-"Internet</html>"
+"<html>L’ouverture de la page d’aide à l’adresse web {0} a échoué."
+"<br>Veuillez vérifier votre connexion Internet</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:357
 msgid "Failed to open URL"
-msgstr "Impossible d’ouvrir l’adresse Web"
+msgstr "Impossible d’ouvrir l’adresse web"
 
 #. putValue(NAME, tr("Open in Browser"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:390
 msgid "Open the current help page in an external browser"
-msgstr "Ouvrir la page dans un navigateur externe"
+msgstr "Afficher l’aide dans un navigateur externe"
 
 #. putValue(NAME, tr("Edit"));
@@ -11277,7 +11289,6 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
-"<html>L’adresse Web <tt>{0}</tt><br>est externe. Les modifications ne sont "
-"possibles que pour les sujets d’aide<br>sur le serveur dédié <tt>{1}</tt>.</"
-"html>"
+"<html>L’adresse web <tt>{0}</tt><br>est externe. Les modifications ne sont "
+"possibles que pour les sujets d’aide<br>du serveur dédié <tt>{1}</tt>.</html>"
 
 #. putValue(NAME, tr("Reload"));
@@ -11309,5 +11320,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566
 msgid "Failed to open help page. The target URL is empty."
-msgstr "Impossible d’ouvrir la page d’aide. L’adresse Web est vide."
+msgstr "Impossible d’ouvrir la page d’aide. L’adresse web est vide."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:567
@@ -11327,20 +11338,20 @@
 msgstr "Coordonnées"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Historique du nœud {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historique du chemin {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Historique de la relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Mettre à jour l’historique depuis le serveur"
@@ -11441,6 +11452,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Groupe de modifications"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11840,5 +11851,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:102
 msgid "Initializing nodes to download ..."
-msgstr ""
+msgstr "Initialisation des nœuds à télécharger…"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -12062,14 +12073,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Un envoi et/ou une sauvegarde d’un calque avec modifications<br>a été "
-"interrompu ou a échoué.</html>"
 msgstr[1] ""
-"<html>Des envois et/ou des sauvegardes de {0} calques avec "
-"modifications<br>ont été interrompus ou ont échoué.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12161,13 +12168,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:103
 msgid "Initializing nodes to update ..."
-msgstr "Initialisation des nœuds à mettre à jour..."
+msgstr "Initialisation des nœuds à mettre à jour…"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:119
 msgid "Initializing ways to update ..."
-msgstr "Initialisation des chemins à mettre à jour..."
+msgstr "Initialisation des chemins à mettre à jour…"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:128
 msgid "Initializing relations to update ..."
-msgstr "Initialisation des relations à mettre à jour..."
+msgstr "Initialisation des relations à mettre à jour…"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:123
@@ -12290,5 +12297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing objects to upload ..."
-msgstr "Préparation des objets à envoyer..."
+msgstr "Préparation des objets à mettre à jour…"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:40
@@ -12458,6 +12465,6 @@
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Envoi d’{0} objet..."
-msgstr[1] "Envoi de {0} objets..."
+msgstr[0] "Envoi d’{0} objet…"
+msgstr[1] "Envoi de {0} objets…"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
@@ -12515,4 +12522,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12548,13 +12556,4 @@
 "maximale du groupe de modifications {1} sur le serveur ''{2}'' est dépassée."
 "</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html><strong>Plusieurs groupes de modifications</strong> sont nécessaires "
-"pour envoyer {0} objets. Quelle méthode voulez-vous utiliser ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12634,38 +12633,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Personnaliser la couleur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Par défaut"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nom : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12676,9 +12675,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12686,26 +12685,26 @@
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Durée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Longueur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Longueur : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12714,8 +12713,8 @@
 msgstr[1] "{0} itinéraires, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12724,12 +12723,12 @@
 msgstr[1] "{0} points de passage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12738,91 +12737,91 @@
 msgstr[1] "{0} traces, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>L’envoi de données GPS non traitées <br>sur la carte est considéré "
-"comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+"<html>L’envoi de données GPS non traitées sur la carte est considéré comme "
+"nocif.<br>Si vous voulez envoyer des traces, lisez ceci :</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converti depuis : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Télécharger le long de cette trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
-msgstr "Tout télécharger dans un rayon de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+msgstr "Télécharger dans un rayon de :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Zone maximale par requête :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
-msgstr "Télécharger à proximité de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+msgstr "Télécharger à proximité :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
-msgstr "trace seulement"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+msgstr "de la trace"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
-msgstr "points de passage seulement"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+msgstr "des points de passage"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
-msgstr "trace et points de passage"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+msgstr "de la trace et des points de passage"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12833,6 +12832,6 @@
 "vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -12840,6 +12839,6 @@
 "la piste audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12849,6 +12848,6 @@
 "la trace ont été ignorés ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12858,27 +12857,27 @@
 "leur horodatage ont été ignorés."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+msgstr "Personnaliser le dessin des traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
-msgstr "Marqueurs depuis des points nommés"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+msgstr "Créer des marqueurs depuis des points nommés"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de la trace nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
-msgstr "Importer Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+msgstr "Importer des sons"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12887,33 +12886,33 @@
 "them with audio data.</html>"
 msgstr ""
-"<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
-"serveur.<br>Impossible de les corréler avec des données audio car leurs "
-"points ne sont pas horodatés.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+"<html>Les données du calque GPX ''{0}'' ont été téléchargées depuis le "
+"serveur.<br>Impossible de les associer à des sons car leurs points ne sont "
+"pas horodatés.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Importation impossible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12922,7 +12921,7 @@
 "them with images.</html>"
 msgstr ""
-"<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
-"serveur.<br>Impossible de les corréler avec des images car leurs points ne "
-"sont pas horodatés.</html>"
+"<html>Les données du calque GPX ''{0}'' ont été téléchargées depuis le "
+"serveur.<br>Impossible de les associer à des images car leurs points ne sont "
+"pas horodatés.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:47
@@ -12950,4 +12949,7 @@
 "Change the projection again or remove the layer."
 msgstr ""
+"Le calque {0} ne supporte pas la projection {1}.\n"
+"{2}\n"
+"Changez de projection ou retirer le calque."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119
@@ -13012,5 +13014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
 msgid "Dataset consistency test"
-msgstr "Test de cohérence du jeu de données"
+msgstr "Tester la cohérence du jeu de données"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
@@ -13022,5 +13024,5 @@
 msgstr "Les problèmes suivants ont été trouvés :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13031,59 +13033,67 @@
 "Les calques TMS ne supportent pas la projection {0}.\n"
 "{1}\n"
-"Modifiez la projection ou retirer le calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+"Changez de projection ou retirer le calque."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Zoom automatique"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Chargement automatique des tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Charger la tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Afficher l’information de la tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Charger toutes les tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Zoomer en avant"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Zoomer en arrière"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Revenir à la taille de la tuile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Réinitialiser le cache des tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "zoomer pour charger des tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "zoomer pour charger davantage de tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
-msgstr "Zoomer plus près pour voir plus de détails"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+msgstr "Zoomer en avant pour voir les détails"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "Pas de tuiles à ce niveau de zoom."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr "Les projections EPSG:4326 et Mercator sont supportées."
@@ -13102,5 +13112,5 @@
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
-"Attention : le calque WMS a été désactivé à cause d’une adresse Web invalide "
+"Attention : le calque WMS a été désactivé à cause d’une adresse web invalide "
 "''{0}''"
 
@@ -13134,5 +13144,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:268
 msgid "Invalid URL?"
-msgstr "Adresse Web invalide ?"
+msgstr "Adresse web invalide ?"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:564
@@ -13204,9 +13214,9 @@
 #, java-format
 msgid "Supported projections are: {0}"
-msgstr ""
+msgstr "Les projections supportées sont : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
 msgid "Correlate to GPX"
-msgstr "Corréler en GPX"
+msgstr "Corréler au format GPX"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
@@ -13636,10 +13646,10 @@
 msgstr "images JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "marqueur GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13647,5 +13657,5 @@
 msgstr[1] "marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13654,5 +13664,5 @@
 msgstr[1] "{0} est constitué de {1} marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -13660,17 +13670,17 @@
 "décalage ."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Afficher Texte/Icônes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Afficher/Masquer le texte des marqueurs et les icônes."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synchroniser l’audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13679,5 +13689,5 @@
 "de synchronisation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13685,14 +13695,14 @@
 msgstr "Fichier audio synchronisé au point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossible de synchroniser dans le calque actuellement joué."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Créer un marqueur audio au niveau de la tête de lecture"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13722,16 +13732,15 @@
 msgstr "Impossible de créer un nouveau marqueur audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
-"Il y a eu une erreur en essayant d’afficher l’adresse Web pour ce marqueur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgstr "Il y a eu une erreur d’affichage de l’adresse web de ce marqueur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
-msgstr "(L’adresse Web était : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgstr "(L’adresse web était : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
-msgstr "Erreur à l’affichage de l’adresse Web"
+msgstr "Erreur d’affichage de l’adresse web"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:199
@@ -13743,10 +13752,10 @@
 msgstr ""
 "Attention : le téléchargement des modèles Mappaint depuis ''{0}'' a échoué. "
-"L’exception : {1}"
+"Exception : {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:260
 #, java-format
 msgid "loading style ''{0}''..."
-msgstr "chargement du modèle ''{0}''..."
+msgstr "Chargement du modèle ''{0}''…"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java:98
@@ -13830,14 +13839,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
 msgid "Request Token URL:"
-msgstr "Adresse Web de requête d’autorisation :"
+msgstr "Adresse web de requête d’autorisation :"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
 msgid "Access Token URL:"
-msgstr "Adresse Web de l’autorisation d’accès :"
+msgstr "Adresse web de l’autorisation d’accès :"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
 msgid "Authorize URL:"
-msgstr "Adresse Web d’autorisation :"
+msgstr "Adresse web d’autorisation :"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -14036,7 +14045,6 @@
 msgstr ""
 "<html>La récupération de l’autorisation d’accès OAuth depuis le serveur OSM "
-"a échoué parce que JOSM n’a pas pu établir<br>une connexion valide à partir "
-"de l’adresse Web OAuth ''{0}''.<br>Veuillez vérifier vos préférences et "
-"réessayer.</html>"
+"a échoué car aucune connexion valide<br>n’a pas pu établie avec l’adresse "
+"web OAuth ''{0}''.<br>Veuillez vérifier vos préférences et réessayer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:488
@@ -14125,5 +14133,5 @@
 msgstr ""
 "Avec OAuth, vous autorisez JOSM  à envoyer les données et les traces GPS "
-"sous votre nom (<a href=''{0}''>plus d’infos...</a>)."
+"sous votre nom (<a href=''{0}''>plus d’infos…</a>)."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:122
@@ -14180,24 +14188,24 @@
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr "Demande de requête d’autorisation OAuth ''{0}'' au site OSM..."
+msgstr "Demande de requête d’autorisation OAuth ''{0}'' au site OSM…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:481
 msgid "Initializing a session at the OSM website..."
-msgstr "Initialisation d’une session sur le site OSM..."
+msgstr "Initialisation d’une session sur le site OSM…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr "Identification de la session pour l’utilisateur ''{0}''..."
+msgstr "Identification de la session pour l’utilisateur ''{0}''…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
 #, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Autorisation de la requête d’accès ''{0}''..."
+msgstr "Autorisation de la requête d’accès ''{0}''…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
 #, java-format
 msgid "Logging out session ''{0}''..."
-msgstr "Fermeture de la session ''{0}''"
+msgstr "Fermeture de la session ''{0}''…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
@@ -14245,5 +14253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
 msgid "Retrieving OAuth Access Token..."
-msgstr "Récupération de l’autorisation d’accès OAuth..."
+msgstr "Récupération de l’autorisation d’accès OAuth…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
@@ -14261,5 +14269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
 msgid "Retrieving OAuth Request Token..."
-msgstr "Récupération de l’autorisation d’accès OAuth..."
+msgstr "Récupération de la requête d’accès OAuth…"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
@@ -14314,11 +14322,11 @@
 "</html>"
 msgstr ""
-"<html>JOSM a récupéré avec succès une autorisation d’accès. JOSM va "
+"<html>Une requête d’autorisation a été récupérée avec succès. JOSM va "
 "maintenant ouvrir une page d’autorisation dans un navigateur externe. "
 "Identifiez-vous avec votre nom d’utilisateur et votre mot de passe OSM et "
-"suivez les instructions pour permettre la requête d’autorisation. Revenez "
-"ensuite à cette fenêtre et cliquez sur <strong>{0}</strong><br>Si le "
-"navigateur externe ne se lance pas, vous pouvez copier cette adresse Web et "
-"la coller dans la barre d’adresse de votre navigateur.</html>"
+"suivez les instructions pour valider la requête. Revenez ensuite à cette "
+"fenêtre et cliquez sur <strong>{0}</strong><br>Si le navigateur ne s’ouvre "
+"pas, copiez cette adresse web et collez-la dans la barre d’adresse de votre "
+"navigateur.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -14438,7 +14446,7 @@
 msgstr ""
 "<html>La récupération des informations sur l’utilisateur depuis le serveur "
-"OSM ''{0}'' a échoué.<br>Le problème ne provient pas de l’autorisation "
-"d’accès testée, mais<br>de la configuration du serveur. Veuillez vérifiez "
-"l’adresse Web du<br>serveur et votre connexion Internet.</html>"
+"OSM ''{0}'' a échoué.<br>Le problème provient de la configuration du "
+"serveur. Veuillez vérifiez l’adresse web du<br>serveur et votre connexion "
+"Internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
@@ -14464,5 +14472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
 msgid "Retrieving user info..."
-msgstr "Récupération des informations sur l’utilisateur..."
+msgstr "Récupération des informations sur l’utilisateur…"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
@@ -14481,5 +14489,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:100
 msgid "Service URL"
-msgstr "Adresse Web du service :"
+msgstr "Adresse web du service :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:105
@@ -14492,4 +14500,6 @@
 "so you can not use it. This message will not show again."
 msgstr ""
+"Le calque ne supporte aucune projection de JOSM, vous ne pouvez pas "
+"l’utiliser."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
@@ -14512,5 +14522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:190
 msgid "TMS URL"
-msgstr "Adresse Web du service :"
+msgstr "Adresse web du service :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:204
@@ -14527,5 +14537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
 msgid "Imagery URL"
-msgstr "Adresse Web"
+msgstr "Adresse web"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:296
@@ -14535,5 +14545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:318
 msgid "Invalid service URL."
-msgstr "L’adresse Web n’est pas valide."
+msgstr "L’adresse web n’est pas valide."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:337
@@ -14746,5 +14756,5 @@
 "the file name and saves it in the same folder.)</i>"
 msgstr ""
-"<i>(JOSM peut garder un fichier de sauvegarde lors de l’enregistrement des "
+"<i>(Un fichier de sauvegarde peut être gardé lors de l’enregistrement des "
 "calques. JOSM ajoute ''~'' au nom du fichier et l’enregistre dans le même "
 "dossier.)</i>"
@@ -14788,53 +14798,53 @@
 msgstr "Couleurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
-msgstr "Seulement à l’extrémité du chemin."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+msgstr "Seulement à l’extrémité du chemin"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Dessiner les flèches des sens uniques"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Afficher l’ordre des segments"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Afficher les limites des données téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Afficher les nœuds virtuels dans la fenêtre de sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Afficher les calques inactifs sous une autre couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Appliquer un anticrénelage"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Afficher seulement les limites des surfaces"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Données GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Dessiner les flèches de direction pour les segments de chemin."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
@@ -14842,20 +14852,20 @@
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Afficher l’ordre de tous les segments des chemins."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un anticrénelage aux contours de la carte."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Afficher les limites des données téléchargées depuis le serveur."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14864,9 +14874,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Afficher les calques de données inactifs sous une autre couleur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14874,15 +14884,51 @@
 msgstr "Supprimer le remplissage des surfaces et forcer le modèle sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Données OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automatique"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Nom"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr "Tout"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr "Nom ou position"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Aucun"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
+msgid "Use global settings."
+msgstr "Ceux par défaut"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr "Utiliser les réglages généraux."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14893,54 +14939,46 @@
 msgstr "Tous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Les fichiers locaux"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Aucun"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Forcer les lignes si aucun segment n’est importé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Dessiner un cercle à partir de la valeur HDOP"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "La vitesse (rouge = lent, vert = rapide)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr "La direction (rouge = ouest, jaune = nord, vert = est, bleu = sud)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "L’atténuation de la précision (rouge = élevée, vert = faible, si disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+msgstr "La date"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
-msgstr "Une seule couleur (personnalisable pour les calques nommés)"
+msgstr "Une seule couleur (personnalisable)"
 
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14964,5 +15002,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15005,5 +15043,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15017,38 +15055,18 @@
 msgstr "Piétons"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Créer des marqueurs à la lecture du GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Dessin rapide (moins joli)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automatiquement"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Nom"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Description"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Les deux"
+msgstr "Ajuster avec les limites des données"
 
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15059,10 +15077,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Tracer des lignes entre les points GPS pour :"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15072,10 +15090,10 @@
 "(''-1'' pour dessiner toutes les lignes)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Longueur maximale des fichiers locaux (mètres) :"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15084,10 +15102,10 @@
 "toutes les lignes)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Longueur maximale (mètres) :"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15096,10 +15114,10 @@
 "d’information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dessiner les flèches de direction des lignes reliant les points GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15108,5 +15126,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15114,14 +15132,14 @@
 msgstr "Ne pas dessiner les flèches si elle ne sont pas au moins distantes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Distance minimale (pixels) :"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Afficher de plus gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15131,13 +15149,13 @@
 "le Gestionnaire de calques)."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Colorier les traces et les points en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr "Colorier les traces et les points en fonction de la direction."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15147,27 +15165,45 @@
 "précision (HDOP). Votre appareil doit enregistrer cette information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Colorier les traces et les points en fonction du type de véhicule."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Colorier les traces et les points selon :"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Nommer les points de passage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15270,5 +15306,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
 msgid "Offset bookmarks"
-msgstr "Décalages enregistrés"
+msgstr "Décalages"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
@@ -15319,17 +15355,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
 msgid "Imagery URL (Default)"
-msgstr "Adresse Web d’imagerie"
+msgstr "Adresse web"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:686
 #, java-format
 msgid "EULA license URL not available: {0}"
-msgstr ""
-"L’adresse Web pour le Contrat de Licence Utilisateur Final (CLUF) n’est pas "
-"disponible : {0}"
+msgstr "L’adresse web du CLUF n’est pas disponible : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:700
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
-msgstr "L’adresse Web n’est pas valide pour la license EULA : {0}"
+msgstr "L’adresse web du CLUF n’est pas valide : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -15406,5 +15440,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:115
 msgid "Add a new style by entering filename or URL"
-msgstr "Ajouter un nouveau modèle"
+msgstr "Ajouter un modèle"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:117
@@ -15432,5 +15466,5 @@
 #, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Téléchargement des sources de modèles depuis ''{0}''"
+msgstr "Téléchargement de la liste des modèles depuis ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:129
@@ -15440,6 +15474,6 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
-"<html>Le chargement de la liste des sources depuis<br>''{0}'' a échoué."
-"<br>Détails :<br>{1}</html>"
+"<html>Le chargement de la liste depuis<br>''{0}'' a échoué.<br>Détails :<br>"
+"{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:136
@@ -15533,7 +15567,5 @@
 "All installed plugins are up to date. JOSM does not have to download newer "
 "versions."
-msgstr ""
-"Tous les greffons installés sont à jour. Aucune nouvelle version n’est "
-"disponible."
+msgstr "Tous les greffons installés sont à jour."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
@@ -15552,9 +15584,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
 msgid "Add JOSM Plugin description URL."
-msgstr "Ajouter une adresse Web de téléchargement des greffons :"
+msgstr "Ajouter une adresse web de téléchargement des greffons :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 msgid "Enter URL"
-msgstr "Saisir l’adresse Web"
+msgstr "Entrer l’adresse web"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
@@ -15565,9 +15597,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:492
 msgid "Edit JOSM Plugin description URL."
-msgstr "Modifier l’adresse Web de téléchargement des greffons."
+msgstr "Modifier l’adresse web de téléchargement des greffons."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:493
 msgid "JOSM Plugin description URL"
-msgstr "Adresse Web de téléchargement des greffons."
+msgstr "Adresse web de téléchargement des greffons."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:48
@@ -15670,5 +15702,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:221
 msgid "Key:"
-msgstr "Clé :"
+msgstr "Touche :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:236
@@ -15807,5 +15839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:48
 msgid "Import data from URL"
-msgstr "Charger les données depuis une adresse Web"
+msgstr "Charger les données depuis une adresse web"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:49
@@ -15859,10 +15891,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSM écoutera toujours sur le port 8111. Ce port n’est pas personnalisable "
-"car il est utilisé par les applications communiquant avec JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15916,5 +15946,5 @@
 #, java-format
 msgid "URL: {0}"
-msgstr "Adresse Web : {0}"
+msgstr "Adresse web : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:637
@@ -15939,5 +15969,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:675
 msgid "URL / File:"
-msgstr "Adresse Web / fichier :"
+msgstr "Adresse web / fichier :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:689
@@ -15951,5 +15981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Rétablir"
@@ -15961,5 +15991,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1023
 msgid "Add a new icon path"
-msgstr "Ajouter un nouveau répertoire"
+msgstr "Ajouter un répertoire"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1036
@@ -16049,5 +16079,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:215
 msgid "Add a new preset by entering filename or URL"
-msgstr "Ajouter un nouveau modèle"
+msgstr "Ajouter un modèle"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:217
@@ -16075,5 +16105,5 @@
 #, java-format
 msgid "Loading preset sources from ''{0}''"
-msgstr "Chargement des sources depuis ''{0}''"
+msgstr "Téléchargement de la liste des modèles depuis ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:229
@@ -16248,6 +16278,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Télécharger et mettre à jour"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16275,5 +16305,5 @@
 #, java-format
 msgid "Testing OSM API URL ''{0}''"
-msgstr "Test de l’adresse Web OSM ''{0}''"
+msgstr "Test de l’adresse web OSM ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
@@ -16283,5 +16313,5 @@
 "validate again.</html>"
 msgstr ""
-"<html>''{0}'' n’est pas une adresse Web OSM valide.<br>Veuillez vérifier "
+"<html>''{0}'' n’est pas une adresse web OSM valide.<br>Veuillez vérifier "
 "l’orthographe et recommencer.</html>"
 
@@ -16289,5 +16319,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
 msgid "Invalid API URL"
-msgstr "L’adresse Web n’est pas valide"
+msgstr "L’adresse web n’est pas valide"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
@@ -16297,6 +16327,6 @@
 "<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
-"<html>La construction de l’adresse Web ''{0}'' pour valider le serveur OSM a "
-"échoué.<br>Veuillez vérifier l’orthographe de ''{1}'' et recommencer.</html>"
+"<html>La construction de l’adresse web ''{0}'' a échoué.<br>Veuillez "
+"vérifier l’orthographe de ''{1}'' et recommencer.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -16306,5 +16336,5 @@
 "''{1}'' and your Internet connection and validate again.</html>"
 msgstr ""
-"<html>La connexion à l’adresse Web ''{0}'' a échoué.<br>Veuillez vérifier "
+"<html>La connexion à l’adresse web ''{0}'' a échoué.<br>Veuillez vérifier "
 "l’orthographe de ''{1}'' et votre connexion Internet et recommencer.</html>"
 
@@ -16440,5 +16470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:89
 msgid "OSM Server URL:"
-msgstr "Adresse Web :"
+msgstr "Adresse web :"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164
@@ -16449,26 +16479,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:165
 msgid "Test the API URL"
-msgstr "Tester l’adresse Web."
+msgstr "Tester l’adresse web."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:181
 msgid "The API URL is valid."
-msgstr "L’adresse Web est valide."
+msgstr "L’adresse web est valide."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:186
 msgid "Validation failed. The API URL seems to be invalid."
-msgstr "La validation a échoué. L’adresse Web ne semble pas valide."
+msgstr "La validation a échoué. L’adresse web ne semble pas valide."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:247
 msgid "OSM API URL must not be empty. Please enter the OSM API URL."
 msgstr ""
-"L’adresse Web ne doit pas être vide. Veuillez entrer l’adresse Web OSM."
+"L’adresse Web ne doit pas être vide. Veuillez entrer une adresse web OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:251
 msgid "The current value is not a valid URL"
-msgstr "La valeur actuelle n’est pas une adresse Web valide"
+msgstr "L’adresse actuelle n’est pas une adresse web valide"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:253
 msgid "Please enter the OSM API URL."
-msgstr "Veuillez entrer l’adresse Web OSM."
+msgstr "Veuillez entrer l’adresse web OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
@@ -16570,5 +16600,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
-msgstr "Plus d’infos..."
+msgstr "Plus d’infos…"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:976
@@ -16664,5 +16694,5 @@
 msgstr "Nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16691,9 +16721,9 @@
 msgstr "Préreglages de recherche"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Afficher les balises applicables à la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Rechercher dans les mots-clés"
@@ -16720,6 +16750,5 @@
 "a bounding box)"
 msgstr ""
-"Adresse Web d’openstreetmap.org (collez ici l’adresse Web d’une zone "
-"délimitée) :"
+"Adresse web d’openstreetmap.org (collez ici l’adresse d’une zone délimitée) :"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:74
@@ -16740,5 +16769,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
-msgstr "Connexion au serveur OSM"
+msgstr "Connexion au serveur OSM…"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
@@ -16801,5 +16830,5 @@
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
-"La valeur pour ''{0}'' dans l’adresse Web de requête du groupe de "
+"La valeur pour ''{0}'' dans l’adresse web de requête du groupe de "
 "modifications est inattendue. Actuellement elle est {1}"
 
@@ -16817,5 +16846,5 @@
 msgid "Unsupported parameter ''{0}'' in changeset query string"
 msgstr ""
-"Le paramètre ''{0}'' n’est pas reconnu dans la requête de groupe de "
+"Le paramètre ''{0}'' n’est pas reconnu dans la requête du groupe de "
 "modifications"
 
@@ -16877,5 +16906,5 @@
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
 msgstr ""
-"Erreur : la connexion au proxy ''{0}'' avec l’adresse Web ''{1}'' a échoué. "
+"Erreur : la connexion au proxy ''{0}'' avec l’adresse web ''{1}'' a échoué. "
 "Exception : {2}"
 
@@ -16892,5 +16921,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
 msgid "Parsing response from server..."
-msgstr "Analyse de la réponse du serveur..."
+msgstr "Analyse de la réponse du serveur…"
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
@@ -16954,5 +16983,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:90
 msgid "Copyright (URL)"
-msgstr "Copyright (adresse Web)"
+msgstr "Copyright (adresse web)"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94
@@ -17006,9 +17035,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Une erreur est survenue lors de l’analyse du fichier GPX {0}. seule une "
-"partie du fichier sera disponible"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17268,5 +17295,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 msgid "Updating changeset..."
-msgstr "Mise à jour du groupe de modifications..."
+msgstr "Mise à jour du groupe de modifications…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
@@ -17285,5 +17312,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
 msgid "Preparing upload request..."
-msgstr "Préparation de la requête d’envoi des données..."
+msgstr "Préparation de la requête d’envoi des données…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:480
@@ -17294,5 +17321,5 @@
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr "Nouvelle tentative {0} sur {1} dans {2} secondes ..."
+msgstr "Nouvelle tentative {0} sur {1} dans {2} secondes…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:491
@@ -17353,8 +17380,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"Le Prolog du document OsmChange n’est pas encore écrite. Veuillez d’abord "
-"écrire."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17477,5 +17502,5 @@
 #: ../plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java:308
 msgid "Parsing changeset content ..."
-msgstr "Analyse du contenu du groupe de modifications..."
+msgstr "Analyse du contenu du groupe de modifications…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:77
@@ -17583,5 +17608,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
-msgstr "Récupération des données de l’historique OSM…"
+msgstr "Analyse des données de l’historique…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
@@ -17595,10 +17620,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Attributs obligatoires manquants dans les limites. Actuellement lon min = "
-"''{0}'', lat min = ''{1}'', lon max = ''{3}'', lat max = ''{4}'', origine = "
-"''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17830,13 +17852,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Prepare OSM data..."
-msgstr "Préparation des données OSM"
+msgstr "Préparation des données…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
 msgid "Parsing OSM data..."
-msgstr "Récupération des données d’OSM"
+msgstr "Analyse des données…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:567
 msgid "Preparing data set..."
-msgstr "Préparation des données"
+msgstr "Préparation des données…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:583
@@ -17886,6 +17908,6 @@
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] "Téléchargement d’{0} groupe de modifications..."
-msgstr[1] "Téléchargement de {0} groupes de modifications..."
+msgstr[0] "Téléchargement d’{0} groupe de modifications…"
+msgstr[1] "Téléchargement de {0} groupes de modifications…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
@@ -17893,5 +17915,5 @@
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr "({0}/{1}) Téléchargement du groupe de modifications {2}..."
+msgstr "({0}/{1}) Téléchargement du groupe de modifications {2}…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
@@ -17899,13 +17921,13 @@
 #, java-format
 msgid "Downloading content for changeset {0} ..."
-msgstr "Téléchargement du contenu du groupe de modifications {0}..."
+msgstr "Téléchargement du contenu du groupe de modifications {0}…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
-msgstr "Téléchargement de l’historique..."
+msgstr "Téléchargement de l’historique…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
 msgid "Contacting Server..."
-msgstr "Connexion au serveur"
+msgstr "Connexion au serveur…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
@@ -17948,9 +17970,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
 msgid "Reading user info ..."
-msgstr "Lecture des informations sur l’utilisateur..."
+msgstr "Lecture des informations sur l’utilisateur…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:76
 msgid "Starting to upload with one request per primitive ..."
-msgstr "Début de l’envoi des données avec une requête par objet..."
+msgstr "Début de l’envoi des données avec une requête par objet…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:84
@@ -17974,5 +17996,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
 msgid "Starting to upload in one request ..."
-msgstr "Début de l’envoi en une requête..."
+msgstr "Début de l’envoi en une requête…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -17985,5 +18007,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:140
 msgid "Starting to upload in chunks..."
-msgstr "Début de l’envoi en blocs..."
+msgstr "Début de l’envoi en blocs…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
@@ -17991,10 +18013,10 @@
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Envoi d’{2} objet..."
-msgstr[1] "({0}/{1}) Envoi de {2} objets..."
+msgstr[0] "({0}/{1}) Envoi d’{2} objet…"
+msgstr[1] "({0}/{1}) Envoi de {2} objets…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 msgid "Uploading data ..."
-msgstr "Téléchargement des données..."
+msgstr "Téléchargement des données…"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:223
@@ -18024,4 +18046,9 @@
 msgstr "Enregistrer le nom d’utilisateur et le mot de passe"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18057,5 +18084,5 @@
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
-msgstr "Attention : l’adresse Web complète est ''{0}''."
+msgstr "Attention : l’adresse web complète est ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:196
@@ -18065,7 +18092,7 @@
 "This may lead to wrong coordinates."
 msgstr ""
-"La projection ''{0}'' de l’adresse Web et la projection {1} ne correspondent "
+"La projection ''{0}'' de l’adresse web et la projection {1} ne correspondent "
 "pas.\n"
-"Cela peut amener à de mauvaises coordonnées."
+"Cela peut fausser les coordonnées."
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -18090,6 +18117,6 @@
 "URL:"
 msgstr ""
-"Le contrôle à distance va charger un calque d’imagerie à partir de l’adresse "
-"Web suivante :"
+"Le contrôle à distance va télécharger un calque d’imagerie depuis l’adresse "
+"web suivante :"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java:48
@@ -18100,12 +18127,12 @@
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
-"Il a été demandé au contrôle à distance de charger des données depuis "
-"l’adresse Web suivante :"
+"Le contrôle à distance va télécharger des données depuis l’adresse web "
+"suivante :"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java:46
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
-"Il a été demandé au contrôle à distance de charger des données depuis "
-"l’adresse Web suivante :"
+"Le contrôle à distance va télécharger des données depuis l’adresse web "
+"suivante :"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java:47
@@ -18177,5 +18204,5 @@
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr "Téléchargement du greffon {0}"
+msgstr "Téléchargement du greffon {0}…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -18212,6 +18239,6 @@
 msgstr ""
 "<html>Le téléchargement du greffon ''{0}'' a été demandé.<br>Ce greffon "
-"n’est plus développé et il est susceptible d’entrainer des erreurs.<br>Il "
-"devrait être désactivé.<br>Le supprimer des préférences ?</html>"
+"n’est plus supporté et il est susceptible d’entrainer des erreurs.<br>Voulez-"
+"vous le supprimer des préférences ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259
@@ -18325,14 +18352,14 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:505
 msgid "Loading plugins ..."
-msgstr "Chargement des greffons..."
+msgstr "Chargement des greffons…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:506
 msgid "Checking plugin preconditions..."
-msgstr "Vérification des conditions requises des greffons..."
+msgstr "Vérification des conditions requises des greffons…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:533
 #, java-format
 msgid "Loading plugin ''{0}''..."
-msgstr "Téléchargement du greffon ''{0}''"
+msgstr "Téléchargement du greffon ''{0}''…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:614
@@ -18352,13 +18379,13 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
 msgid "Determine plugins to load..."
-msgstr "Déterminer les greffons à charger..."
+msgstr "Déterminer les greffons à charger…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:654
 msgid "Removing deprecated plugins..."
-msgstr "Suppression des greffons dépréciés..."
+msgstr "Suppression des greffons dépréciés…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:656
 msgid "Removing unmaintained plugins..."
-msgstr "Suppression des greffons plus supportés..."
+msgstr "Suppression des greffons plus supportés…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:680
@@ -18472,5 +18499,5 @@
 msgstr ""
 "Le greffon a été supprimé de la configuration. Veuillez redémarrer JOSM pour "
-"que le greffon ne soit plus chargé."
+"le retirer complètement."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1042
@@ -18497,9 +18524,9 @@
 #, java-format
 msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr "L’adresse Web ''{0}'' n’est pas valide dans le greffon {1}"
+msgstr "L’adresse web ''{0}'' n’est pas valide dans le greffon {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:252
 msgid "More info..."
-msgstr "(plus d’infos...)"
+msgstr "(plus d’infos…)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:256
@@ -18523,9 +18550,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:47
 msgid "Reading local plugin information.."
-msgstr "Lecture des informations locale  du greffon..."
+msgstr "Lecture des informations du greffon…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:91
 msgid "Processing plugin site cache files..."
-msgstr "Traitement des fichiers de cache associés aux greffons..."
+msgstr "Traitement des fichiers cache du greffon…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:95
@@ -18546,14 +18573,14 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:116
 msgid "Processing plugin site cache icon files..."
-msgstr "Mise en cache des icônes du greffon..."
+msgstr "Mise en cache des icônes du greffon…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:140
 msgid "Processing plugin files..."
-msgstr "Traitement des fichiers du greffon..."
+msgstr "Traitement des fichiers du greffon…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:67
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:78
 msgid "Download plugin list..."
-msgstr "Téléchargement de la liste des greffons..."
+msgstr "Téléchargement de la liste des greffons…"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:160
@@ -18589,6 +18616,5 @@
 "Exception was: {1}"
 msgstr ""
-"L’analyse de la liste des greffons du site ''{0}'' a échoué. Le site est "
-"abandonné. Exception : {1}"
+"L’analyse de la liste des greffons du site ''{0}'' a échoué. Exception : {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:348
@@ -18625,7 +18651,6 @@
 "file a bug report."
 msgstr ""
-"Une erreur inattendue est survenue.<br>Il s’agit d’une erreur de codage. "
-"Merci de remplir un rapport d’erreur<br>si vous utilisez la dernière version "
-"de JOSM."
+"Une erreur de codage est survenue.<br>Merci de remplir un rapport d’erreur "
+"si vous utilisez la dernière version de JOSM."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:82
@@ -18663,5 +18688,5 @@
 "information below at this URL:"
 msgstr ""
-"Vous pouvez aussi remplir manuellement le rapport à cette adresse Web :"
+"Vous pouvez aussi remplir manuellement le rapport à cette adresse web :"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
@@ -18680,5 +18705,5 @@
 msgstr ""
 "<html>La communication avec le serveur ''{0}'' a échoué.<br>Vérifiez "
-"l’adresse Web du serveur dans vos préférences et votre connexion Internet.</"
+"l’adresse web du serveur dans vos préférences et votre connexion Internet.</"
 "html>"
 
@@ -18907,5 +18932,5 @@
 "Le serveur ''{0}'' ne reconnaît pas un objet<br>que vous essayez de lire, "
 "mettre à jour ou supprimer. Soit cet objet<br>n’existe pas sur le serveur, "
-"soit vous utilisez une adresse Web qui n’est pas valide pour y accéder."
+"soit vous utilisez une adresse web qui n’est pas valide pour y accéder."
 "<br>Veuillez vérifier l’adresse du serveur ''{0}''."
 
@@ -18918,5 +18943,5 @@
 msgstr ""
 "<html>La connexion au serveur distant<br>''{0}'' a échoué.<br>Le nom de "
-"l’hôte ''{1}'' ne peut pas être résolu.<br>Veuillez vérifier l’adresse Web "
+"l’hôte ''{1}'' ne peut pas être résolu.<br>Veuillez vérifier l’adresse web "
 "dans vos préférences et votre connexion Internet.</html>"
 
@@ -18953,4 +18978,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18982,5 +19009,5 @@
 "platform first."
 msgstr ""
-"L’ouverture de l’adresse Web a échoué car aucun navigateur n’est défini. "
+"L’ouverture de l’adresse web a échoué car aucun navigateur n’est défini. "
 "Veuillez d’abord choisir un navigateur."
 
@@ -18996,5 +19023,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:57
 msgid "unused"
-msgstr "inutilisé"
+msgstr "Inutilisé"
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -19049,6 +19076,6 @@
 "was: {1}"
 msgstr ""
-"Attention : la lecture du message du jour depuis ''{0}'' a échoué pour des "
-"raisons de sécurité. Exception : {1}"
+"Attention : la lecture du message du jour depuis ''{0}'' a échoué par "
+"sécurité. Exception : {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
@@ -19093,4 +19120,18 @@
 msgid "Failed to load XML schema."
 msgstr "Impossible de charger le schéma XML."
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
 
 #. *
@@ -19131,5 +19172,5 @@
 #: build/specialmessages.java:12
 msgid "could not get audio input stream from input URL"
-msgstr "impossible d’obtenir un flux d’entré audio depuis l’adresse Web"
+msgstr "impossible d’obtenir un flux d’entré audio depuis l’adresse web"
 
 #. Java message loading audio data
@@ -19160,5 +19201,5 @@
 msgctxt "landuse"
 msgid "farmland"
-msgstr ""
+msgstr "terre arable"
 
 #. Landuse type used in multipolygons
@@ -19172,5 +19213,5 @@
 msgctxt "natural"
 msgid "scrub"
-msgstr ""
+msgstr "broussailles"
 
 #. relation type
@@ -19682,6 +19723,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Permet de filtrer les traces GPS inutiles"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
@@ -22628,5 +22669,5 @@
 #: build/trans_presets.java:2079
 msgid "Wheelchairs"
-msgstr "Fauteuils roulants"
+msgstr "Accessible aux fauteuils roulants"
 
 #. item "Ways/Path" combo "Ski"
@@ -25524,5 +25565,5 @@
 #: build/trans_presets.java:2314 build/trans_presets.java:4088
 msgid "Website"
-msgstr "Site Web"
+msgstr "Site web"
 
 #. item "Car/Tyres" text "Email Address"
@@ -25858,5 +25899,5 @@
 #: build/trans_presets.java:1663 build/trans_presets.java:2490
 msgid "Wheelchair"
-msgstr "Fauteuils roulants"
+msgstr "Accessible aux fauteuils roulants"
 
 #. </optional>
@@ -26305,5 +26346,5 @@
 #: build/trans_presets.java:2062
 msgid "Internet access fee"
-msgstr "Accès à internet payant"
+msgstr "Accès Internet payant"
 
 #. item "Facilities/Accommodation/Hotel" combo "Smoking"
@@ -26333,5 +26374,5 @@
 #: build/trans_presets.java:2063 build/trans_presets.java:2078
 msgid "Smoking"
-msgstr "Fumer"
+msgstr "Autorisation de fumer"
 
 #. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
@@ -28014,5 +28055,5 @@
 msgctxt "color"
 msgid "black"
-msgstr ""
+msgstr "noir"
 
 #. item "Facilities/Bench" combo "Colour" display value
@@ -28020,5 +28061,5 @@
 msgctxt "color"
 msgid "brown"
-msgstr ""
+msgstr "marron"
 
 #. item "Facilities/Bench" combo "Colour" display value
@@ -28032,5 +28073,5 @@
 msgctxt "color"
 msgid "red"
-msgstr ""
+msgstr "rouge"
 
 #. item "Facilities/Bench" combo "Colour" display value
@@ -28038,5 +28079,5 @@
 msgctxt "color"
 msgid "blue"
-msgstr ""
+msgstr "bleu"
 
 #. item "Facilities/Bench" combo "Colour" display value
@@ -28044,5 +28085,5 @@
 msgctxt "color"
 msgid "gray"
-msgstr ""
+msgstr "gris"
 
 #. item "Facilities/Bench" combo "Colour" display value
@@ -28050,5 +28091,5 @@
 msgctxt "color"
 msgid "white"
-msgstr ""
+msgstr "blanc"
 
 #. item "Facilities/Bench" combo "Amount of Seats"
@@ -28065,5 +28106,5 @@
 #: build/trans_presets.java:2558
 msgid "Type of shelter"
-msgstr ""
+msgstr "Type"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
@@ -28071,5 +28112,5 @@
 msgctxt "shelter"
 msgid "weather_shelter"
-msgstr ""
+msgstr "abri contre les intempéries"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
@@ -28083,5 +28124,5 @@
 msgctxt "shelter"
 msgid "picnic_shelter"
-msgstr ""
+msgstr "abri pour pique-nique"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
@@ -28089,5 +28130,5 @@
 msgctxt "shelter"
 msgid "wildlife_hide"
-msgstr ""
+msgstr "abri d’observation"
 
 #. item "Facilities/Hunting Stand"
@@ -28193,5 +28234,5 @@
 msgctxt "hydrant position"
 msgid "lane"
-msgstr ""
+msgstr "voie"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
@@ -28199,5 +28240,5 @@
 msgctxt "hydrant position"
 msgid "parking_lot"
-msgstr ""
+msgstr "parking"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
@@ -28205,5 +28246,5 @@
 msgctxt "hydrant position"
 msgid "sidewalk"
-msgstr ""
+msgstr "trottoir"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
@@ -30455,5 +30496,5 @@
 #: build/trans_presets.java:3104
 msgid "solar"
-msgstr ""
+msgstr "solaire"
 
 #. item "Power/Power Generator" combo "Source" display value
@@ -30470,30 +30511,30 @@
 #: build/trans_presets.java:3104
 msgid "biofuel"
-msgstr ""
+msgstr "biocarburant"
 
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
 msgid "waste"
-msgstr ""
+msgstr "déchets"
 
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
 msgid "biomass"
-msgstr ""
+msgstr "biomasse"
 
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
 msgid "geothermal"
-msgstr ""
+msgstr "géothermie"
 
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
 msgid "biogas"
-msgstr ""
+msgstr "biogaz"
 
 #. item "Power/Power Generator" combo "Method"
 #: build/trans_presets.java:3105
 msgid "Method"
-msgstr ""
+msgstr "Méthode"
 
 #. item "Power/Power Generator" combo "Method" display value
@@ -30505,30 +30546,30 @@
 #: build/trans_presets.java:3105
 msgid "combustion"
-msgstr ""
+msgstr "combustion"
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
 msgid "fission"
-msgstr ""
+msgstr "fission nucléaire"
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
 msgid "thermal"
-msgstr ""
+msgstr "transfert thermique"
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
 msgid "gasification"
-msgstr ""
+msgstr "gazéification"
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
 msgid "wind_turbine"
-msgstr ""
+msgstr "éolienne"
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
 msgid "anaerobic_digestion"
-msgstr ""
+msgstr "méthanisation"
 
 #. item "Power/Power Station"
@@ -36040,4 +36081,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -36054,6 +36096,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -36072,15 +36114,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "nom de rue abrégé"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "attribut oneway (sens unique) sur un nœud"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "attribut bridge (pont) sur un nœud"
@@ -36091,12 +36133,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "valeur incorrecte de l’attribut « voie (highway) » sur un nœud"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Chemin non-classifié non nommé."
@@ -36105,16 +36147,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "Voie sans référence"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "type de voie temporaire"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "nom de clé mal orthographié"
@@ -36124,10 +36166,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "voie cyclable avec l’attribut « vélo (bicyle) »"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "chemin pour piétons avec l’attribut « piéton (foot) »"
@@ -36136,10 +36178,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "voie cyclable séparée avec l’attribut couloir cyclable"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Barrière utilisée sur la voie"
@@ -36148,35 +36190,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "Limitation de vitesse utilisée pour un chemin pour piétons"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "Étiquette du calque avec un signe +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "le nom de la rue contient ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relation sans type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurant sans nom"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "combinaison inhabituelle d’attributs"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36281,117 +36332,127 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "MSR Maps Topo"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "MSR Maps Urban"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "CUZK:KM - République tchèque"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "UHUL:ORTOFOTO - République tchèque"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Cartes NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "Cartes NPE (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "Ordnance Survey (7th series) - Royaume-Uni"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT (ORTHO) - Japon"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT (ORTHO01) - Japon"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT (ORTHO02) - Japon"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT (ORTHO03) - Japon"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italie"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicile - Italie"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italie"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (France)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA Spain"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Estonia Multi (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Denmark)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Denmark)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36441,5 +36502,5 @@
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:359
 msgid "Processing..."
-msgstr "Traitement en cours…"
+msgstr "Traitement…"
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:375
@@ -36533,5 +36594,5 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:48
 msgid "Download Track ..."
-msgstr "Téléchargement de la trace"
+msgstr "Téléchargement de la trace…"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:48
@@ -36543,5 +36604,5 @@
 #, java-format
 msgid "Invalid URL {0}"
-msgstr "L’adresse Web {0} n’est pas valide"
+msgstr "L’adresse web {0} n’est pas valide"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:86
@@ -36549,5 +36610,5 @@
 #, java-format
 msgid "Error fetching URL {0}"
-msgstr "Une erreur est survenue lors de la récupération de l’adresse Web {0}"
+msgstr "Une erreur est survenue lors de la récupération de l’adresse web {0}"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:88
@@ -36557,5 +36618,6 @@
 msgid "Error parsing data from URL {0}"
 msgstr ""
-"Une erreur est survenue lors de l’analyse des données de l’adresse Web {0}"
+"Une erreur est survenue lors de l’analyse des données depuis l’adresse web "
+"{0}"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:64
@@ -36641,14 +36703,14 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:198
 msgid "Uploading trace ..."
-msgstr "Envoi de la trace..."
+msgstr "Envoi de la trace…"
 
 #. Set progress dialog to indeterminate while connecting
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209
 msgid "Connecting..."
-msgstr "Connexion"
+msgstr "Connexion…"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Envoi annulé"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36750,9 +36812,9 @@
 msgstr "(aucune donnée d’élévation)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr "Ne peut pas sauvegarder les préférences"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36770,23 +36832,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36794,26 +36886,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr "Veuillez bouger la souris pour dessiner un nouveau chemin"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informations sur le greffon"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr "Ne peut pas placer de nœud à l’extérieur de la planète"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr "Dessin du chemin avec la souris"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36821,6 +36941,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Corriger les adresses"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -36930,9 +37050,9 @@
 msgstr "Afficher les adresses incomplètes"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "articles"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "aucun objet"
@@ -37008,5 +37128,5 @@
 "according tag."
 msgstr ""
-"Tente d’estimer l’adresse en choisissant le nom de l’objet le plus proche "
+"Tente de deviner l’adresse en choisissant le nom de l’objet le plus proche "
 "avec l’attribut correspondant."
 
@@ -37036,17 +37156,34 @@
 msgstr "Sélectionner toutes les adresses incomplètes"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Propriétés du calque"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Importer une image"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Importer une image géoréférencée"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Une erreur est survenue lors de la création du calque image : "
@@ -37620,5 +37757,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:36
 msgid "Advanced..."
-msgstr "Avancé..."
+msgstr "Avancé…"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:66
@@ -37731,5 +37868,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:170
 msgid "CadastreGrabber: Illegal url."
-msgstr "CadastreGrabber : l’adresse Web est erronée."
+msgstr "CadastreGrabber : l’adresse web est erronée."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:85
@@ -37758,33 +37895,35 @@
 msgstr "Sélectionner la commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Enregistrer la source automatiquement"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Le greffon cadastre-fr utilise la touche F11 comme raccourci pour le "
-"téléchargement\n"
-"du cadastre mais celle-ci est actuellement affectée à l’affichage plein "
-"écran.\n"
-"Voulez-vous affecter la touche F11 au téléchargement du cadastre ?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Affecter le raccourci de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM a été arrêté pour que le réglage prenne effet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37834,13 +37973,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
 msgid "25 m"
-msgstr ""
+msgstr "25 m"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
 msgid "50 m"
-msgstr ""
+msgstr "50 m"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "100 m"
-msgstr ""
+msgstr "100 m"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
@@ -37906,14 +38045,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
-"<html>Valeur de la clé \"source\" lorsque son enregistrement est activé</"
-"html>"
+msgstr "<html>Valeur de la clé \"source\" lors de son autocomplétion</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Remplacer le fond blanc original par la couleur définie dans les préférences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37922,6 +38058,6 @@
 "Useful for texts on dark backgrounds."
 msgstr ""
-"Inverser les couleurs originales (noir et blanc et tous les gris "
-"intermédiaires). Pratique pour lire les textes sur fond noir."
+"Inverser les couleurs (noir, blanc et gris intermédiaires). Pratique pour "
+"lire les textes sur fond noir."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131
@@ -37937,5 +38073,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Afficher les limites des données téléchargées depuis le serveur."
+msgstr "Afficher les limites des données téléchargées."
 
 #. option to select the single grabbed image resolution
@@ -37991,9 +38127,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Fixed size square (default is 100m)"
-msgstr "Carré de taille fixe (100m par défaut)"
+msgstr "Carré de taille fixe (100 m par défaut)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "Taille fixe (de 25 à 1000 mètres)"
+msgstr "Taille fixe (de 25 à 1000 m)"
 
 #. WMS layers selection
@@ -38046,4 +38182,6 @@
 "Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
+"Ajouter les tableaux d’assemblages dans la liste des calques cadastraux à "
+"télécharger."
 
 #. the crosspiece display
@@ -38054,11 +38192,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
 msgid "Allows an automatic caching"
-msgstr ""
+msgstr "Utiliser l’enregistrement automatique"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
-"Les fichiers les plus anciens sont automatiquement supprimés lorsque cette "
-"taille est dépassée"
+"Les fichiers les plus anciens seront supprimés lorsque cette limite est "
+"dépassée"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340
@@ -38091,5 +38229,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:30
 msgid "Contacting WMS Server..."
-msgstr "Connexion au serveur..."
+msgstr "Connexion au serveur…"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:165
@@ -38112,5 +38250,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
 msgid "Extract SVG ViewBox..."
-msgstr "Extraire le ViewBox du SVG..."
+msgstr "Extraire le ViewBox du SVG…"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:69
@@ -38570,5 +38708,5 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
 msgid "Download along..."
-msgstr "Télécharger le long..."
+msgstr "Télécharger le long…"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
@@ -38704,5 +38842,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
 msgid "New tool..."
-msgstr "Nouvel outil..."
+msgstr "Nouvel outil…"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
@@ -38844,25 +38982,25 @@
 msgstr "Ajouter le calque EGPX"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:"
 msgstr ""
-"<html>L’envoi de données GPS non traitées <br>sur la carte est considéré "
-"comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :"
-
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+"<html>L’envoi de données GPS non traitées sur la carte est considéré comme "
+"nocif.<br>Si vous voulez envoyer des traces, lisez ceci :</html>"
+
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Tracer des lignes entre les points pour ce calque."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas tracer de ligne entre les points pour ce calque."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
@@ -39014,5 +39152,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -39020,10 +39158,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -39032,5 +39170,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -39039,6 +39177,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -39047,9 +39185,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -39208,71 +39346,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr "Sélection du dossier"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr "Véhicule"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Créer"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr "Couleur du nœud"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr "Nouveau marque-page"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39280,32 +39426,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr "réinitialiser le Marque-Page"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr "Choix de la couleur du nœud"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -39340,6 +39480,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -39456,5 +39596,5 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
 msgid "Import..."
-msgstr "Importation en cours…"
+msgstr "Importation…"
 
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:52
@@ -39468,34 +39608,47 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:139
 msgid "Importing..."
-msgstr "Importation en cours…"
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+msgstr "Importation…"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+msgstr "km/h"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
-msgstr ""
+msgstr "Nom de la trace : "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39701,9 +39854,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
-msgstr "Exécution de la réduction Vertex..."
+msgstr "Exécution de la réduction Vertex…"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
 msgid "Running Douglas-Peucker approximation..."
-msgstr "Exécution de l’approximation de Douglas-Peucker..."
+msgstr "Exécution de l’approximation de Douglas-Peucker…"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
@@ -40201,5 +40354,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -40216,5 +40369,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40474,5 +40627,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OpenInBrowserAction.java:49
 msgid "Open in browser"
-msgstr "Ouvrir dans un navigateur internet"
+msgstr "Ouvrir dans un navigateur externe"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OpenInBrowserAction.java:60
@@ -40482,5 +40635,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OpenInBrowserAction.java:70
 msgid "Open in browser: "
-msgstr "Ouvrir dans un navigateur internet : "
+msgstr "Ouvrir dans un navigateur externe : "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:98
@@ -40513,5 +40666,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 msgid "Open Visible..."
-msgstr "Ouvrir le visible..."
+msgstr "Ouvrir le visible…"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
@@ -40572,5 +40725,5 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238
 msgid "Select projection..."
-msgstr ""
+msgstr "Sélectionner la projection"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:243
@@ -40580,5 +40733,5 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:246
 msgid "Load file..."
-msgstr "Chargement…"
+msgstr "Chargement du fichier…"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:247
@@ -40883,5 +41036,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
 msgid "Writing position information to image files..."
-msgstr "Écriture des informations sur la position dans les fichiers image..."
+msgstr "Écriture des informations sur la position dans les fichiers image…"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:208
@@ -40939,5 +41092,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:55
 msgid "Load Picture Calibration..."
-msgstr "Charger l’étalonnage de l’image..."
+msgstr "Charger l’étalonnage de l’image…"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:55
@@ -40962,17 +41115,17 @@
 msgstr "Nouveau calque depuis le presse-papier"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Fichiers image supportés"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
-msgstr "Nouveau calque image depuis le fichier..."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+msgstr "Nouveau calque image depuis le fichier…"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Impossible de trouver l’objet de la carte."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "Impossible pour PicLayer de charger ou d’importer l’image."
@@ -40986,41 +41139,33 @@
 msgstr "La donnée du presse-papier n’est pas une image"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "Un fichier de calibration associé au fichier image a été trouvé :"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(définir ''{0}'' sur oui/non/demander dans les préférences\n"
-"pour le chargement automatique des fichiers)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "Voulez-vous l’appliquer ?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "Charger le fichier de calibration ?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Il sera appliqué automatiquement."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr "Les fichiers de calibration seront à présent chargés automatiquement."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Définir ''{0}'' sur oui/non/demander dans les préférences\n"
-"pour le chargement automatique des fichiers."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -41158,5 +41303,5 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:111
 msgid "Create Stops from GTFS ..."
-msgstr "Créer des arrêts à partir de GTFS ..."
+msgstr "Créer des arrêts depuis un fichier GTFS"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
@@ -41358,5 +41503,5 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:417
 msgid "Route patterns ..."
-msgstr "Dessins de l’itinéraire..."
+msgstr "Dessins de l’itinéraire…"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:418
@@ -41641,5 +41786,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41709,9 +41854,9 @@
 #: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:54
 msgid "Preparing history data..."
-msgstr "Préparation des données de l’historique"
+msgstr "Préparation des données de l’historique…"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:50
 msgid "Reverting..."
-msgstr "Rétablissement..."
+msgstr "Rétablissement…"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
@@ -41748,5 +41893,5 @@
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
 msgid "New picture layer from RGIS..."
-msgstr "Nouveau calque photo en provenance de RGIS..."
+msgstr "Nouveau calque depuis un fichier RGIS"
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
@@ -41997,5 +42142,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr "Surveyor..."
+msgstr "Surveyor"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -42258,5 +42403,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:18
 msgid "Export sigs..."
-msgstr "Export des signatures..."
+msgstr "Exporter les signatures"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:18
@@ -42266,5 +42411,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:19
 msgid "Export sigs to XML..."
-msgstr "Export des signatures en fichier XML..."
+msgstr "Exporter les signatures en fichier XML"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:34
@@ -42480,9 +42625,9 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:208
 msgid "Prepare stuff..."
-msgstr "Préparation..."
+msgstr "Préparation…"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:209
 msgid "Parsing Signature data..."
-msgstr "Analyse des données de la signature..."
+msgstr "Analyse des données de la signature…"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustAnalyzer.java:26
@@ -42633,4 +42778,21 @@
 msgstr "Créer une nouvelle clé de signature"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42713,5 +42875,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:62
 msgid "Create/Edit turn restriction..."
-msgstr "Créer/Modifier une interdiction de tourner..."
+msgstr "Créer/Modifier une interdiction de tourner…"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:64
@@ -42867,12 +43029,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
-"Cette interdiction de tourner se réfère à un objet qui a été supprimé à "
-"l’extérieur de l’éditeur :"
 msgstr[1] ""
-"Cette interdiction de tourner se réfère à {0} objets qui ont été supprimés à "
-"l’extérieur de l’éditeur :"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -43038,5 +43196,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:85
 msgid "Public service vehicles like buses, tramways, etc."
-msgstr "Véhicules de service public, comme les bus, tramways, etc."
+msgstr "Véhicules de service public (bus, tramways…)"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:97
@@ -43133,6 +43291,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Ouvrir un éditeur pour l’interdiction de tourner sélectionné"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43431,6 +43589,6 @@
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
 msgstr ""
-"Ouvrir l’éditeur basique et choisir des exceptions basées sur les types de "
-"véhicules standards"
+"Ouvrir l’éditeur basique et choisir des exceptions standardes basées sur les "
+"types de véhicules"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
@@ -43752,5 +43910,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43896,5 +44054,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:128
 msgid "Slower"
-msgstr "Plus lentement"
+msgstr "Plus lent"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:127
@@ -44011,5 +44169,5 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
-msgstr "Carte scannée…"
+msgstr "Carte scannée"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
@@ -44023,6 +44181,6 @@
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
-"Entrer une adresse Web walking-papers.org ou un identifiant (la valeur après "
-"le ?id= dans l’URL)"
+"Entrer une adresse web walking-papers.org ou un identifiant (la valeur après "
+"le ?id= dans l’adresse web)"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
@@ -44096,9 +44254,9 @@
 "continue way downloading?</html>"
 msgstr ""
-"<html>il n’y a plus aucun chemin connecté à télécharger.<br>Cependant un "
+"<html>Il n’y a plus aucun chemin connecté à télécharger.<br>Cependant un "
 "nœud probablement dupliqué et correspondant au nœud sélectionné a été trouvé."
 "<br>Le nœud sélectionné est ''{0}''<br>Le nœud probablement dupliqué est "
-"''{1}''<br>Voulez-vous le fusionner  avec le nœud sélectionné et continuer "
-"le téléchargement des chemins ?</html>"
+"''{1}''<br>Voulez-vous le fusionner  avec celui sélectionné et continuer le "
+"téléchargement des chemins ?</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -44155,5318 +44313,200 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Ouvrir la page des préférences pour les réglages généraux."
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
-
-#~ msgid "No data imported."
-#~ msgstr "Aucune donnée importée"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Sélectionner un marque-page en premier."
-
-#~ msgid "File could not be found."
-#~ msgstr "Impossible de trouver le fichier."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pas encore implémenté."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extension de fichier inconnue."
-
-#~ msgid "gps track description"
-#~ msgstr "description de la trace GPS"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Load Selection"
-#~ msgstr "Charger la sélection"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Supprimer le calque sélectionné."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} supprimés)"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "point"
-#~ msgstr[1] "points"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "une trace avec {0} point"
-#~ msgstr[1] "une trace avec {0} points"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} point"
-#~ msgstr[1] "{0} points"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Aucune heure pour le point {0}·x·{1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Aucune image avec des informations horaires lisibles trouvée."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Allumage du GPS : {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Extinction du GPS : {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "différence de fuseau horaire : "
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "image"
-#~ msgstr[1] "images"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} dans la trace."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Impossible de lire les marque-pages."
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objet est conflictuel :"
-#~ msgstr[1] "{0} objets sont conflictuels :"
-
-#~ msgid "my version:"
-#~ msgstr "ma version :"
-
-#~ msgid "their version:"
-#~ msgstr "version du serveur :"
-
-#~ msgid "resolved version:"
-#~ msgstr "version choisie :"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contact du serveur OSM..."
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL du serveur de base"
-
-#~ msgid "OSM password"
-#~ msgstr "Mot de passe OSM"
-
-#~ msgid "Unknown version"
-#~ msgstr "Version inconnue"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "différent"
-
-#~ msgid "true"
-#~ msgstr "vrai"
-
-#~ msgid "false"
-#~ msgstr "faux"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Résoudre {0} conflits dans {1} objets"
-
-#~ msgid "Change"
-#~ msgstr "Changer"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erreur durant le chargement de la page {0}"
-
-#~ msgid "help"
-#~ msgstr "aide"
+#~ msgid "Upload cancelled"
+#~ msgstr "Envoi annulé"
 
 #~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous "
-#~ "avez obtenu JOSM."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Ouverture de la révision..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Entrer le mot de passe"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Greffon non trouvé : {0}"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Entrer un nom pour cet emplacement."
-
-#~ msgid "zoom level"
-#~ msgstr "niveau de zoom"
-
-#~ msgid "to"
-#~ msgstr "à"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Une valeur vide supprime la clé."
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Editer la relation #{0}"
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupé par"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossible de se connecter au serveur."
-
-#~ msgid "Timespan: "
-#~ msgstr "Intervalle de temps : "
-
-#~ msgid "Length: "
-#~ msgstr "Longueur : "
-
-#~ msgid "Images for {0}"
-#~ msgstr "Images pour {0}"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Tous les greffons installés sont à jour."
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyme"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Créer des marqueurs non-audio en lisant le GPX."
+#~ "Liste des éléments fusionnés. Ils remplaceront mes éléments lorsque les "
+#~ "décisions de fusion seront appliquées."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Conserver leurs coordonnées"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Conserver mes coordonnées"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "combinaison inhabituelle d’attributs"
+
+#~ msgid "Changeset"
+#~ msgstr "Groupe de modifications"
 
 #~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Longueur maximale (en mètres) pour dessiner des lignes. Régler à '-1' "
-#~ "pour dessiner toutes les lignes."
+#~ "Attention : le numéro de version de JOSM dans le fichier de révision est "
+#~ "inattendu, la valeur est ''{0}''"
 
 #~ msgid ""
-#~ "<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, '.'/Period 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>"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "<p>Vous pouvez remarquer que la liste de sélection des clés sur la page "
-#~ "suivante liste toutes les touches que Java connait sur n'importe quel "
-#~ "type de clavier, et pas uniquement les touches de votre clavier. "
-#~ "N'utilisez que les touches existant vraiment sur cotre clavier. Ainsi, si "
-#~ "votre clavier n'a pas de touche 'Copy' (les claviers de PC n'en ont pas "
-#~ "mais les claviers Sun en ont), ne l'utilisez pas. N'utilisez pas non plus "
-#~ "une touche qui correspond à un raccourcie de votre claiver. Ne pas "
-#~ "respecter cela pourra aboutir sur des conflits, JOS ne savant par exemple "
-#~ "pas que Ctrl+Maj+; et Ctrl+: sont la même chose pour un clavier américain."
-#~ "</p>"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Merci de votre compréhension</p>"
+#~ "Attention : l’exception est ignorée car la tâche a été annulée. "
+#~ "Exception : {0}"
 
 #~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr "<p>Le pseudo-modifieur 'désactivé' désactivera le raccourci.</p>"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Activation des greffons mis à jour"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "RemoveRelationMember"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr ""
+#~ "Attention : l’exception est ignorée car la tâche a été annulée. "
+#~ "Exception : {0}"
 
 #~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Sélection \"{0}\" est utilisé par la relation \"{1}\" avec le role {2}.\n"
-#~ "Supprimer de la relation ?"
+#~ "<html><strong>Plusieurs groupes de modifications</strong> sont "
+#~ "nécessaires pour envoyer {0} objets. Quelle méthode voulez-vous utiliser ?"
+#~ "</html>"
 
 #~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "La sélection \"{0}\" est utilisée par la relation \"{1}\".\n"
-#~ "Supprimer de la relation ?"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert Zone (France)"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Aide en ligne de JOSM"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Impossible de renommer le fichier \"{0}\"."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Entrer des valeurs pour tous les conflits."
+#~ "<html>Sinon vous pouvez préciser <strong>l’adresse d’une tuile</strong> "
+#~ "au format <i>niveau de zoom/x/y</i>, par exemple <i>15/256/223</i>. Les "
+#~ "formats <i>zoom,x,y</i> et <i>zoom;x;y</i> sont aussi valides.</html>"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Ouvrir un éditeur pour l’interdiction de tourner sélectionné"
 
 #~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Tous les nouveaux chemins ont été ajoutés à une relation basée sur \"role"
-#~ "\".\n"
-#~ "Vous devriez vérifier cela et corriger si nécessaire."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Envoyer tous les changements sur le serveur OSM."
-
-#~ msgid "Uploading data"
-#~ msgstr "Envoi des données"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Arguments manquants pour le OU"
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Arguments manquants pour le -"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Les parenthèses doivent être fermées."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Déplacer un segment du chemin pour faire un rectangle."
-
-#~ msgid "Jump back."
-#~ msgstr "Aller en arrière"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Marqueur précédent"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Lire le marqueur précédent"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Avancer plus lentement"
-
-#~ msgid "Next Marker"
-#~ msgstr "Marqueur suivant"
-
-#~ msgid "Play next marker."
-#~ msgstr "Lire le marqueur suivant"
-
-#~ msgid "Jump forward"
-#~ msgstr "Aller en avant"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Avancer plus vite"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Ne pas appliquer les changements"
-
-#~ msgid "change the viewport"
-#~ msgstr "changer le viewport"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Actions permises"
+#~ "Attention : l’initialisation des préférences a échoué. Impossible de "
+#~ "rétablir le fichier des préférences par défaut : {0}"
 
 #~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Zoom : molette de souris ou double-clic.   Déplacer la carte : garder le "
-#~ "bouton droit de souris enfoncé et déplacer la souris.   Sélection : Clic"
-
-#~ msgid "Validate either current selection or complete dataset."
+#~ "Une erreur est survenue lors de l’analyse du fichier GPX {0}. seule une "
+#~ "partie du fichier sera disponible"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
 #~ msgstr ""
-#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
-
-#~ msgid "Grid"
-#~ msgstr "Grille"
-
-#~ msgid "start"
-#~ msgstr "début"
-
-#~ msgid "end"
-#~ msgstr "fin"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Carte glissante"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Montrer le status de la dalle"
-
-#~ msgid "requested: {0}"
-#~ msgstr "demandé : {0}"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} ont été trouvées pour être géoétiquettées."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Images géoétiquettées"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Je suis dans le fuseau horaire de : "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Ouvrez une autre photo"
+#~ "Le Prolog du document OsmChange n’est pas encore écrite. Veuillez d’abord "
+#~ "écrire."
 
 #~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "<html>Je peux prendre un autre phot de mon GPS.<br>Cela peut-il aider ?</"
-#~ "html>"
-
-#~ msgid "Update position for: "
-#~ msgstr "Mettre à jour la position pour : "
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Images sans position EXIF"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Trace GPX chargée"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier image id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "Help / About"
-#~ msgstr "Aide / À propos"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rotation de la grille"
-
-#~ msgid "World"
-#~ msgstr "Monde"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "Motorboat"
-#~ msgstr "Bateaux à moteur"
-
-#~ msgid "Boat"
-#~ msgstr "Bateaux"
-
-#~ msgid "Cycleway"
-#~ msgstr "Voie cyclable"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Piste grade 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Piste grade 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Piste grade 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Piste grade 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Piste grade 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Éditer un chemin de randonnée"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Chemin de randonnée en montagne"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Éditer un chemin de randonnée en montagne"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Éditer un chemin de randonnée en montagne exigeant"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Chemin de randonnée alpin"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin"
-
-#~ msgid "Shop"
-#~ msgstr "Concession/Réparation"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianist"
-
-#~ msgid "Amenities"
-#~ msgstr "Équipements"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO·(GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO·(GNOME·Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO·(WebKit)"
-
-#~ msgid "Do not show again"
-#~ msgstr "Ne plus afficher"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Attribut requis manquant \"{0}\"."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
-
-#~ msgid "Download Area"
-#~ msgstr "Télécharger zone"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Éditer une nouvelle relation"
-
-#~ msgid "Create new relation"
-#~ msgstr "Créer une nouvelle relation"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Éditer les propriétés"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Membres : {0}"
-
-#~ msgid "Add Selected"
-#~ msgstr "Ajouter la sélection"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> n’a pas de ref"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "L’objet avec l’id=0 est illégal"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Mot de passe ou nom d’utilisateur incorrect."
+#~ "Attributs obligatoires manquants dans les limites. Actuellement lon min = "
+#~ "''{0}'', lat min = ''{1}'', lon max = ''{3}'', lat max = ''{4}'', origine "
+#~ "= ''{5}''."
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Attention - le chargment de {0} greffon a été demandé. Ce greffon n’est "
-#~ "plus nécessaire."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ "L’exception est ignorée car le téléchargement a été annulé. Exception : "
+#~ "{0}"
+
+#~ msgid "Both"
+#~ msgstr "Les deux"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Corriger les adresses"
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
 #~ msgstr ""
-#~ "Indication : Certains changements viennent de l’envoi de nouvelles "
-#~ "données sur le serveur."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchroniser l’horloge"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Impossible d’écrire un marque-page."
+#~ "Les fichiers de calibration seront à présent chargés automatiquement."
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "Un fichier de calibration associé au fichier image a été trouvé :"
 
 #~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Mot de passe d’identification au compte OSM. Laisser blanc pour ne "
-#~ "stocker aucun mot de passe."
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Erreur à la lecture du fichier d’information du greffon : {0}"
+#~ "JOSM ne s’attendait à trouver ici les objets [{0} {1}]. Veuillez le "
+#~ "rapporter sur http://josm.openstreetmap.de . Néanmoins, ce n’est pas une "
+#~ "erreur critique. Vous pouvez continuer à travailler en toute sécurité."
 
 #~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "<p>De plus, les raccourcis sont activés lorsque les actions sont "
-#~ "assignées à un bouton d’une entrée du menu pour la première fois. "
-#~ "Certains de vos changements pourraient donc être activés même sans "
-#~ "redémarrage --- mais également sans gestion des conflits avec les "
-#~ "raccourcis existants. C’est une autre raison pour <b>redémarrer</b> JOSM "
-#~ "après avoir fait n’importe quel changement ici.</p>"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Les paramètres sont lus dans l’ordre dans lequel ils sont spécifiés, "
-#~ "soyez donc\n"
-#~ "sur d’avoir chargé des données avant --selection"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "L’activation des greffons mis à jour a échoué. Vérifiez si JOSM a "
-#~ "l’autorisation de remplacer les greffons existants."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Erreur d’analyse"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
-#~ "JOSM"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. "
-#~ "Voulez-vous encore les fusionner ?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr ""
-#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr ""
-#~ "Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre."
-
-#~ msgid "load data from API"
-#~ msgstr "chargement des données depuis l’API"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Position d’origine de la grille"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr ""
-#~ "Fusionner le calque immédiatement en dessous avec le calque sélectionné."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "Il y a des changements non enregistrés. Supprimer le calque quand même ?"
-
-#~ msgid "name"
-#~ msgstr "nom"
-
-#~ msgid "Bridleway"
-#~ msgstr "Chemin équestre"
-
-#~ msgid "Footway"
-#~ msgstr "Voie piétonne"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Lecture GPX..."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Mise à jour des greffons suivants :\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Pas d'information sur les greffons trouvée."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Version {1}{2}"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Paramètres du serveur mandataire (proxy)"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Télécharger les greffons suivants ?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Ne pas dessiner les flêches si elle ne sont pas au moins distantes de "
-#~ "cette valeur l'une de l'autre."
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Greffon mis à jour avec succès. Veuillez redémarrer JOSM."
-#~ msgstr[1] "{0} Greffons mis à jour avec succès. Veuillez redémarrer JOSM."
-
-#~ msgid "Set the language."
-#~ msgstr "Définir la langue"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Ouvrir fichier (données brutes gps, si .gpx)"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Mise à jour des greffons"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossible de télécharger le greffon : {0} de {1}"
-
-#~ msgid "File not found"
-#~ msgstr "Fichier non trouvé"
-
-#~ msgid "Rotate"
-#~ msgstr "Pivoter"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Degrés Minutes Secondes"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "O"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Supprimer {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Supprimer {1} {0}"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relation conflictuelle"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Vous pouvez changer le nombre de jours au bout duquel cet avertissement "
-#~ "s'affiche<br>en modifiant l'option de configuration 'pluginmanager."
-#~ "warntime'.)"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Soyez sûr(e) d'inclure l'information suivante :"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Erreur d'analyse de la réponse du serveur"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Une erreur est survenue avec les greffons suivants :\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Charger ces changements ?"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Une erreur est survenue lors de la restauration de la sauvegarde."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Une erreur est survenue lors de la sauvegarde."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Impossible de sauvegarder le fichier."
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "enlever \"{0}\" de {1} \"{2}\""
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Enlever \"{0}\" pour {1} {2}"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Ces nœuds ne sont pas en cercle."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Veuillez sélectionner exactement trois nœuds ou un chemin contenant "
-#~ "exactement trois nœuds."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Certains points sont (presque) sur la ligne"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "La selection ne doit contenir uniquement que des chemins"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Veuillez sélectionner au moins une tâche à télécharger"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Chemins sélectionnés dupliqués"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Chemin dupliqué"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Créer un chemin dupliqué"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Marquer ce problème comme \"fait\"?"
-
-#~ msgid "change the selection"
-#~ msgstr "Changer la sélection"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importer un fichier TCX comme une trace GPS"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importer un fichier TCX..."
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "à côté de"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "image not loaded"
-#~ msgstr "image non chargée"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Ouvrir les images avec AgPifoJ..."
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Images non encore étiquetées"
-
-#~ msgid "All images"
-#~ msgstr "Toutes les images"
-
-#~ msgid "osmarender options"
-#~ msgstr "options osmarender"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "URL de base du serveur OSM (REST API)"
-
-#~ msgid "error requesting update"
-#~ msgstr "Error lors de la mise à jour"
-
-#~ msgid "error loading metadata"
-#~ msgstr "Erreur lors du chargement des metadata"
-
-#~ msgid "Request Update"
-#~ msgstr "Demander une mise à jour"
-
-#~ msgid "Copy Default"
-#~ msgstr "Copier défaut"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Préférences du greffon WMS"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Télécharger la tuile WMS depuis {0}"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Veuillez sélectionner la colonne à copier"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Aide sur le greffon WMS"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Edit Station"
-#~ msgstr "Éditer la station"
-
-#~ msgid "Accomodation"
-#~ msgstr "Hôtel"
-
-#~ msgid "citymap"
-#~ msgstr "carte de la ville"
-
-#~ msgid "map"
-#~ msgstr "carte"
-
-#~ msgid "Charge"
-#~ msgstr "Charge"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Veuillez sélectionner des chemins avec des angles droits afin de les "
-#~ "orthogonaliser."
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Afficher les images géo-étiquetées"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Pont-levis"
-
-#~ msgid "hikingmap"
-#~ msgstr "carte de randonnée"
-
-#~ msgid "bicyclemap"
-#~ msgstr "carte de randonnée cycliste"
-
-#~ msgid "board"
-#~ msgstr "tableau"
-
-#~ msgid "Split way segment"
-#~ msgstr "Séparer le segment du chemin"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Nombre de câbles"
-
-#~ msgid "Grid layout"
-#~ msgstr "Quadrillage"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Indiquer la procédure effectuée pour arriver à cette erreur (aussi "
-#~ "détaillée que possible) !"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>La dernière page liste les touches de modifiaction que JOSM assignera "
-#~ "automatiquement à des raccourcis. Pour chacun des quatre types de "
-#~ "raccourcis, il y a trois alternatives. JOSM essaiera ces alternatives "
-#~ "dans l’ordre de la liste pour essayer de résoudre un conflit. Si toutes "
-#~ "les alternatives sont des raccourcis déjà utilisés, JOSM assignera un "
-#~ "raccourci au hasard.</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Ces réglages des raccourcis clavier prennent effet au démarrage de "
-#~ "JOSM. Vous devez donc <b>redémarrer</b> JOSM pour voir vos changements.</"
-#~ "p>"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Le serveur ne supporte pas les révisions"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Élément <nd> trouvé sur un non-chemin."
-
-#~ msgid "x from"
-#~ msgstr "x de"
-
-#~ msgid "y from"
-#~ msgstr "y de"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Vous utilisez la projection EPSG:4326 qui peut conduire<br> à des "
-#~ "résultats non désirés lors d'alignements rectangulaires.<br>Modifiez le "
-#~ "type de projection pour supprimer cet avertissement.<br>Voulez-vous "
-#~ "continuer ?"
-
-#~ msgid "park_and_ride"
-#~ msgstr "Automobiles en libre service"
-
-#~ msgid ""
-#~ "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 rapporter un bogue."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ATTENTION : Le mot de passe est stocké en texte brut dans le "
-#~ "fichier de préférences.<br>Le mot de passe est transféré en texte brut au "
-#~ "serveur, encodé dans l’URL.<br><b>N’utilisez pas un mot de passe de "
-#~ "valeur.</b></html>"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Impossible de lire quelque chose depuis l’URL : \"{0}\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Erreur d’analyse dans l’URL : \"{0}\""
-
-#~ 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°"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Impossible de dupliquer un chemin non ordonné"
-
-#~ 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"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Vous pouvez ajouter, éditer et supprimer des sources WMS dans l'onglet "
-#~ "Préférences du greffon WMS - elles apparaitront ensuite dans le menu "
-#~ "WMS.\n"
-#~ "\n"
-#~ "Vous pouvez également faire cela manuellement dans les Préférences "
-#~ "avancées, en utilisant le schéma suivant :\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"
-#~ "Exemple  d'URL WMS complet (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&\n"
-#~ "format=image/jpeg \n"
-#~ "\n"
-#~ "Pour Metacartas Map Rectifier http://labs.metacarta.com/rectifier/ , vous "
-#~ "devez seulement entrer l' 'id' correspondant.\n"
-#~ "Pour ajouter une entrée Metacarta Map Rectifer dans le menu, créez "
-#~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l'id de "
-#~ "votre image : \n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
-#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
-#~ " \n"
-#~ "Note : Assurez-vous que l'image est utilisable et sous une licence "
-#~ "compatible. En cas de doute, ne l'utilisez pas."
-
-#~ msgid "Portcullis"
-#~ msgstr "Herse"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Élément <member> trouvé dans une non-relation."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr ""
-#~ "Afficher des informations sur l’historique des chemins et des nœuds d’OSM."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "id du nœud mal formé"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr ""
-#~ "Télécharger tous les chemins et les nœuds incomplets dans la relation"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. "
-#~ "Voulez-vous encore les fusionner ?"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Seulement deux nœuds autorisés"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Seulement un nœud sélectionné"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr ""
-#~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin "
-#~ "encore utilisé"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Dupliquer {0} nœuds en {1} nœuds"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Ce test vérifie si deux routes, chemins de fer ou voies d’eau se croisent "
-#~ "sur le même calque sans être connectés par un nœud."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Membre \"{0}\" supprimé de la relation."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Membre vide dans la relation."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Le multipolygone \"{0}\" n'est pas fermé."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Chemin \"{0}\" comporte moins de deux points."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Non-chemin \"{0}\" dans le multipolygone."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Un des fichiers sélectionnés était vide !!!"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Attention : {0}"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Erreur : {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Le fichier des préférences contient des erreurs. Sauvegarde de l’ancien "
-#~ "fichier dans {0}."
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Remplacer la sélection par les données utilisateurs"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Ouvrir la page utilisateur dans le navigateur"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Sélectionner les données de l'utilisateur"
-
-#~ msgid "Open User Page"
-#~ msgstr "Ouvrir la page utilisateur"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr ""
-#~ "Veuillez sélectionner un utilisateur en utilisant la liste des auteurs"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Désolé, cela ne fonctionne pas avec des utilisateurs anonymes"
-
-#~ msgid "Please select some data"
-#~ msgstr "Veuillez sélectionner quelques données"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Afficher la liste des auteurs"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
-
-#~ msgid "Painting problem"
-#~ msgstr "Problème de rendu"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Vérifier les notes de rendu."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Le greffon {0} semble endommagé ou n'a pas pu être téléchargé "
-#~ "automatiquement."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La projection \"{0}\" est prévue pour les latitudes\n"
-#~ "comprises entre 46,1° et 57° seulement.\n"
-#~ "Veuillez utiliser un autre système de projection\n"
-#~ "si vous n'utilisez pas un serveur WMS français.\n"
-#~ "Ne pas charger de données après ce message."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Chargement vers OSM..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger "
-#~ "la version actuelle en supprimant l'archive existante?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Vérifier si le rendu de carte a généré des erreurs."
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Chemin de randonnée en montagne exigeant"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Auteurs : {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflits : {0}"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "History of Element"
-#~ msgstr "Historique de l'élément"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Impossible de joindre le serveur OSM. Veuillez vérifier votre "
-#~ "connectivité Internet."
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Ouvrir la fenêtre OpenStreetBugs et activer le téléchargement automatique"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Ouvrir dans le navigateur"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre "
-#~ "nœuds."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' et 'Street' dans n'importe quelle clé ou "
-#~ "nom."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak'  n'importe où dans le nom."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' dans n'importe quelle clé ou nom."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - pas 'Bak' dans le nom."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objet avec l'ID spécifié"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Utilisez <b>\"</b> pour citer des opérateurs (i.e. si la clé contient :)"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Rôle inconnu \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Type de membre inconnu pour \"{0}\"."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"."
-
-#~ msgid "Download List"
-#~ msgstr "Télécharger la liste"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Le greffon est déjà installé"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Impossible de supprimer le fichier du greffon : {0}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Télécharger les greffons manquants"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "La liste des greffons a été obtenue à partir de {0} site."
-#~ msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
-
-#~ msgid "intermedia"
-#~ msgstr "rouge"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Mofiifer boutique de boissons"
-
-#~ msgid "advance"
-#~ msgstr "noire"
-
-#~ msgid "optician"
-#~ msgstr "Opticien"
-
-#~ msgid "sports"
-#~ msgstr "Magasin de sport"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Public"
-
-#~ msgid "No password provided."
-#~ msgstr "Pas de mot de passe fourni."
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Téléchargement depuis le serveur WMS du Cadastre français"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Fichier tampon de la zone Lambert 1 (.1)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Fichier tampon de la zone Lambert 2 (.2)"
-
-#~ msgid "Zone"
-#~ msgstr "Zone"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations "
-#~ "entre deux zones)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Zone Lambert"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Sélectionner le tableau d'assemblage"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Fichier tampon de la zone Lambert 4 (.4)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Fichier tampon de la zone Lambert 3 (.3)"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Ajouter le commentaire de source suivant :"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Zine Lambert {0} du tampon incompatible avec la zone de Lambert courante "
-#~ "{1}"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Une prise en charge du WMS du cadastre français à l'adresse www.cadastre."
-#~ "gouv.fr<BR><BR>Merci de lire les conditions d'utilisation ici : <br><a "
-#~ "href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr."
-#~ "html\"> http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html</a> <BR>avant tout chargement de "
-#~ "données créé à partir de ce greffon."
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Division du téléchargement de zone :"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Mettre {0}={1} pour {2}\"{3}\""
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Mettre {0}={1} pour {2} {3}"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Pour activer le greffon cadastre WMS, modifiez\n"
-#~ "la projection JOSM en Lambert et redémarrez"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Le serveur a retourné une erreur. Essayez de réduire la taille de la zone "
-#~ "à charger, et/ou attendez un peu avant de recommencer."
-
-#~ msgid "Save and Exit"
-#~ msgstr "Enregistrer et quitter"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Retirer tous les objets sélectionnés de la relation"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Supprimer la sélection"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Ville {0} non trouvée ou non disponible sur le WMS.\n"
-#~ "Veuillez vérifier sa disponibilité sur www.cadastre.gouv.fr"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Extraire les empreintes des bâtiments"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Phrases malformées : "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Erreur lors de l'import des trames NMEA !"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Phrases inconnues : "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Pas de coordonnées : "
-
-#~ msgid "Login"
-#~ msgstr "Identifiant"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Supprimer et télécharger"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Télécharger les greffons"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Fusionner tout de même"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" n'est pas fermé et ne peut donc être joint."
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "CECI EST EXPÉRIMENTAL. Sauvegardez votre travail et vérifiez avant de "
-#~ "charger."
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Pas d'intersection trouvée. Rien n'a été modifié."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continuer tout de même"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Erreurs de syntaxe : "
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné."
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Paramètres du greffon SlippyMap."
-
-#~ msgid "autozoom"
-#~ msgstr "autozoom"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Veuillez rapporter un billet à {0}"
-
-#~ msgid "Error during parse."
-#~ msgstr "Erreur pendant l’analyse syntaxique."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr ""
-#~ "Erreur d'analyse syntaxique : la structure du document n’est pas valide "
-#~ "pour un document gpx"
-
-#~ msgid "Commit comment"
-#~ msgstr "Commentaire sur cette déposition"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interruption en cours..."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Modifications non enregistrées"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Veuillez saisir une chaîne de caractères pour la recherche"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr ""
-#~ "Impossible de lire les résultats de recherche du lieu depuis le serveur"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Sources et types de données"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Vous pouvez utiliser la souris ou les boutons Ctrl+flèches pour zoomer et "
-#~ "faire glisser."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Il y a eu des conflits pendant l’importation."
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Ajouter les objets sélectionnés en tant que membres"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Supprimer le membre de cette relation de l'entrée actuelle de la table"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Cliquer sur Recharger pour rafraîchir la liste"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Rétablir l’état des objets actuellement sélectionnés à la version "
-#~ "préalablement sélectionnée dans la liste de l’historique."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Voulez-vous vraiment supprimer la totalité du calque ?"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Supprimer le calque"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Calques: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Actualiser la liste de sélection."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Fusionner les conflits."
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} est constitué de {1} trace"
-#~ msgstr[1] "{0} est constitué de {1} traces"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "variation différentielle actuelle : {0}s"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "La date du fichier \"{0}\" n'a pas pu être analysée."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchroniser l’heure avec l’instrument GPS"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "La date indiquée ne peut être analysée."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nom d’utilisateur (e-mail) du compte OSM."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nom d’utilisateur OSM (courriel)"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Ajouter soit site-josm.xml soit des pages Wiki."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Hôte du serveur mandataire"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Activer le serveur mandataire (proxy)"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Port du serveur mandataire"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Nom d’utilisateur du serveur mandataire"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Mot de passe du serveur mandataire"
-
-#~ msgid "layer not in list."
-#~ msgstr "le calque n’est pas dans la liste."
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANT : données positionnées trop loin\n"
-#~ "de la zone de Lambert actuelle.\n"
-#~ "Ne plus charger de données après ce message.\n"
-#~ "Annulez votre dernière action, sauvegardez votre travail\n"
-#~ "et démarrez un nouveau calque sur cette nouvelle zone."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. "
-#~ "Merci de signaler ceci comme une erreur."
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Ouvrir d'abord un calque (GPX, OSM, cache)"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Ajouter un nouveau calque"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Centre de la trame : {0}"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Ajuster la position du calque WMS sélectionné"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Ajuster la position du calque WMS"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Une erreur exceptionnelle s'est produite.\n"
-#~ "\n"
-#~ "Ceci est toujours une erreur de programmation. Si vous utilisez la "
-#~ "dernière\n"
-#~ "version de JOSM, et afin d'améliorer celle-ci, merci de nous fournir un "
-#~ "rapport d'erreur."
-
-#~ msgid "Update Data"
-#~ msgstr "Mettre à jour les données"
-
-#~ msgid "Move Down"
-#~ msgstr "Déplacer vers le bas"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editeur de relation : {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Résoudre le conflit"
-
-#~ msgid "Move Up"
-#~ msgstr "Déplacer vers le haut"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Changez auparavant la projection en {0}"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Mettre à jour le calque de données depuis le serveur (télécharger à "
-#~ "nouveau les données)"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Projection invalide"
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr ""
-#~ "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Cette action va nécessiter {0} requêtes de téléchargement. Souhaitez-vous "
-#~ "continuer ?"
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\""
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Veuillez sélectionner au moins un nœud, chemin ou relation. Seuls les "
-#~ "éléments déjà chargés ont un historique."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Trouvé {0} correspondances sur {1} dans la trace GPX {2}"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Différence de temps de {0} jours)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "{0} photo(s) sur {1} correspond(ent) à la trace GPX."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Différence entre la trace et les photos : {0}min. {1}sec."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Les photos ne contienne tpas d'information d'horodatage"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "La trace GPX sélectionnée n'est pas horodatée. Veuillez en sélectionner "
-#~ "une autre."
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr ""
-#~ "Les photos sélectionnées ne contiennent pas d'information d'horodatage."
-
-#~ msgid "Default Values"
-#~ msgstr "Valeurs par défaut"
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Une erreur est survenue lors de l'association des photos avec la trace "
-#~ "GPX. Vous pouvez ajuster les curseurs pour faire correspondre les photos "
-#~ "manuellement."
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr ""
-#~ "Les erreurs suivantes sont survenues durant le téléchargement groupé :"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Modifier Office du Tourisme"
-
-#~ msgid "Map Type"
-#~ msgstr "Type de carte"
-
-#~ msgid "Board Type"
-#~ msgstr "Type de bureau"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Éditer une piste grade 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Éditer une piste grade 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Éditer une piste grade 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Éditer une piste grade 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Éditer une piste grade 5"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Chemin de randonnée alpin exigeant"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin exigeant"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Chemin de randonnée alpin difficile"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin difficile"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Modifier un pont-levis"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Modifier une herse"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Modifier aéroport"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Panneau de direction (randonnée)"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Source de balises prédéfinies"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Sources des balises prédéfinies"
-
-#~ msgid ""
-#~ "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 "
-#~ "balises prédéfinies. Voir http://josm.openstreetmap.de/wiki/"
-#~ "TaggingPresets pour plus d'informations"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Ajouter une nouvelle source de balises prédéfinies à la liste."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Groupe de balises \"{0}\""
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- version utilisée {0}"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Basculer en mode plein écran"
-
-#~ msgid "Full Screen"
-#~ msgstr "Plein écran"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">english</A>."
-
-#~ msgid "Optional"
-#~ msgstr "Optionnel"
-
-#~ msgid "Add grid"
-#~ msgstr "Ajouter la grille"
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr "Une prise en charge du serveur WMS du cadastre français."
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Un autre greffon de géo-marquage pour JOSM. Corrèle des photos avec des "
-#~ "traces GPS, ou importe des photos géo-marquées."
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simule un clic lorsque vous faites un léger déplacement. C'est utile pour "
-#~ "les tablettes graphiqyes, lorsque vous avez du mal à cliquer sans "
-#~ "déplacer la souris (problème général Java - tablettes graphiques)"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Affiche une carte glissante dans JOSM. Peut charger des tuiles depuis une "
-#~ "carte glissante en tâche de fond et demander des mises à jour."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Outil pour travailler avec les auteurs/utilisateurs. Sélectionnez une "
-#~ "donnée de l'utilisateur sur la carte pour ouvrir un navigateur affichant "
-#~ "la page du profil de l'auteur."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Quelques utilitaires qui vous rendent la vie plus facile : par ex. "
-#~ "simplifier un chemin, joindre des aires, aller à une position."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Charger des fichiers TCX directement depuis JOSM."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "La principale fonction du greffon est de permettre la suppression de "
-#~ "points de la trace GPX. Ce greffon peut être utilisé pour préparer des "
-#~ "traces à être chargées vers OSM, par ex. en supprimant des parties "
-#~ "inintéressantes des traces."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "La projection n'a pas pu être lue depuis les préférences. Utilisation de "
-#~ "EPSG:4326"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Fusionner quand même"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Toutes les voies étaient vides"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Haut Palatinat Geofabrik.de"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Clickez pour ajouter des noeuds routiers."
-
-#~ msgid "<multiple>"
-#~ msgstr "<multiple>"
-
-#~ msgid "Start routing"
-#~ msgstr "Commencer la navigation"
-
-#~ msgid "Fix relations"
-#~ msgstr "Corriger les relations"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Supprimer les nœuds du chemin"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Cliquer et glisser pour déplacer les nœuds du chemin."
-
-#~ msgid "Closed Way"
-#~ msgstr "Chemin fermé"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Calque de la grille :"
-
-#~ msgid "autoload tiles"
-#~ msgstr "chargement automatique des tuiles"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Zoom automatique : "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Chargement automatique des tuiles : "
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr ""
-#~ "Certaines modifications n'ont pas été sauvegardées. Perdre ces "
-#~ "modifications et continuer ?"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr ""
-#~ "Communication établie avec {0} en utilisant le protocole de version {1}"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Elle supporte les protocoles de version 0.5 ou 0.6, alors que le serveur "
-#~ "ne supporte que les versions {0} à {1}."
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Il manque le numéro de version dans les données OSM."
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Version inconnue : {0}"
-
-#~ msgid "Error processing changeset upload response"
-#~ msgstr "Erreur lors du traitement de la réponse au changement envoyé"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Pas de nouveau changement à envoyer"
-
-#~ msgid "Not initialized"
-#~ msgstr "Non initialisé"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La projection \"{0}\" est utilisée pour\n"
-#~ "les latitudes entre 45.7° et 47.9°\n"
-#~ "et les longitutes entre 5.7° et 10.6° uniquement.\n"
-#~ "Veuillez utiliser un autre système de projection si vous ne travaillez "
-#~ "pas\n"
-#~ "sur des données de Suisse ou du Liechtenstein.\n"
-#~ "Ne pas envoyer de données après ce message."
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "L'envoi de données a échoué pour une raison inconnue"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Impossible de lire une valeur numérique dans la réponse"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Longueur maximale (en mètres) pour tracer les lignes des fichiers locaux. "
-#~ "Entrez '-1' pour dessiner toutes les lignes."
-
-#~ msgid "linked"
-#~ msgstr "lié"
-
-#~ msgid "More details"
-#~ msgstr "Plus de détails"
-
-#~ msgid "% of lat:"
-#~ msgstr "% de lat. :"
-
-#~ msgid "% of lon:"
-#~ msgstr "% de lon. :"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible."
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Donnée invalide pour l'attribut \"version\" sur la primitive OSM d'id "
-#~ "{0}, valeur {1}"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "La projection ne peut être lue dans les préférences. Mercartor sera "
-#~ "utilisé."
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Attribut \"type\" manquant sur le membre {0} de la relation {1}"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ChangeRelationMemberRole"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
-#~ "valeur {1}"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Attribut \"version\" manquant sur la primitive OSM d’id {0}"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr ""
-#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation "
-#~ "{1}, valeur {2}"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Impossible d’initialiser la communication avec le serveur OSM {0}.\n"
-#~ "Vérifiez l’URL du serveur dans les préférences, ainsi que votre connexion "
-#~ "Internet."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - clé 'type' avec la valeur exacte 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - clé 'type' avec n'importe quelle valeur. Essayez aussi "
-#~ "<b>*=valeur</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations "
-#~ "sur les nœuds requièrent des nombres ou des plages de nombres, par "
-#~ "exemple : 10-20"
-
-#~ msgid "Resolve conflicts in member list of of relation {0}"
-#~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Résoudre les conflits de la liste de noeuds du chemin {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Résoudre les conflits de version de {0} {1}"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valeur inorrecte de l’opération sur id : {0}. Un nombre est attendu."
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Étiquettes ({0} conflits)"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Résoudre {0} conflits d’étiquette dans {1} {2}"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "élément {0} non trouvé dans la liste"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "paramètre en dehors de la plage : reçu {0}"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copier mes éléments sélectionnés à la fin de la liste des éléments "
-#~ "fusionnés"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Copier leurs éléments sélectionnés avant le premier élément sélectionné "
-#~ "de la liste des éléments fusionnés"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Remonter les éléments sélectionnés d'un cran"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Copier mes éléments sélectionnés après le premier élément sélectionné de "
-#~ "la liste des éléments fusionnés"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Copier mes éléments sélectionnés avant le premier élément sélectionné de "
-#~ "la liste des éléments fusionnés"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copier leurs éléments sélectionnés à la fin de la liste des éléments "
-#~ "fusionnés"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Copier leurs éléments sélectionnés au début de la liste des éléments "
-#~ "fusionnés"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Descendre les éléments sélectionnés d'un cran"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Clicquer <strong>{0}</strong> pour arrêter la fusion de leurs "
-#~ "éléments avec les miens</html>"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Libérer la liste courante des éléments fusionnés"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Cliquer <strong>{0}</strong> pour commencer la fusion de leurs "
-#~ "éléments avec les miens</html>"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Fige la liste courante des éléments fusionnés"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr ""
-#~ "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
-
-#~ msgid ""
-#~ "Properties in the merged element. They will replace properties in my "
-#~ "elements when  merge decisions are applied."
-#~ msgstr ""
-#~ "Propriétés des éléments fusionnés. Elles remplaceront les propriétés des "
-#~ "éléments lorsque les choix de fusion seront appliqués."
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "le paramètre {0} ne peut pas être vide"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "index de colonne inattendu. Reçu {0}"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "variable {0} non encore enregistrée"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr "variable {0} non encore enregistrée."
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr ""
-#~ "impossible de fusionner un élément dont le conflit d’étiquette n’a pas "
-#~ "été résolu"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
-#~ "commande de résolution"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "impossible de résoudre un conflit non arbitré"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Appliquer la résolution partielle"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr ""
-#~ "ATTENTION : valeur inattendue du paramètre conflict.resolution, reçu "
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Vous n’avez pas fini de résoudre les conflits.<br>Cliquez <strong>"
-#~ "{0}</strong> pour appliquer les conflits déjà résolus.<br>Vous pourrez "
-#~ "résoudre les conflits restants plus tard.<br>Cliquez <strong>{1}</strong> "
-#~ "pour retourner à la résolution de conflits.</html>"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} greffon téléchargé avec succès. Veuillez redémarrer JOSM."
-#~ msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM."
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Fin de la ligne atteinte"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Intersection atteinte"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urbain"
-
-#~ msgid "Uploading"
-#~ msgstr "Téléchargement"
-
-#~ msgid "preference {0} missing. Can't initialize OsmApi"
-#~ msgstr "La préférence {0} est manquante. Impossible d'initialiser OsmApi"
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Vérification si le nœud {0} est supprimé..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Restauration de la relation..."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Oui, les restaurer également"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Non, annuler l’opération"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Il y a {0} nœuds additionnels faisant partie du chemin {1}<br>qui "
-#~ "sont supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</"
-#~ "html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Restaurer ces nœuds également ?"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Restauration du chemin..."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A "
-#~ "HREF=\"{1}\">votre langage</A>."
-
-#~ msgid "Update failed"
-#~ msgstr "La mise à jour a échoué"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Échec de la mise à jour des primitives sélectionnées."
-
-#~ msgid "Keep mine"
-#~ msgstr "Conserver ma version"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Vérification si la primitive {0} est supprimée..."
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Restaurer les primitives ?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
-#~ "supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
-#~ "html>"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "valeur inattendue retournée. Reçue {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitive supprimée du serveur"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>La primitive OSM d’id <strong>{0}</strong> a été supprimée<br>sur "
-#~ "le serveur par un autre utilisateur.<br><br>Cliquez <strong>{1}</strong> "
-#~ "pour garder votre primitive et ignorer l’état supprimé.<br>Votre "
-#~ "primitive obtiendra un nouvel id.<br>Cliquez <strong>{2}</strong> pour "
-#~ "accepter l’état du serveur et supprimer votre primitive.<br>Cliquez "
-#~ "<strong>{3}</strong> pour annuler.<br>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Supprimer ma version"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Il y a <strong>{0}</strong> primitives <br>sélectionnées pour mise "
-#~ "à jour. Veuillez réduire la sélection<br>à un maximum de {1} primitives.</"
-#~ "html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "La sélection est trop large"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
-
-#~ msgid "Update Selection"
-#~ msgstr "Mettre à jour la sélection"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Met à jour la sélection de primitive depuis le serveur"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Impossible de trouver la primitive d’id {0} dans le jeu de données courant"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitive manquante"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Mise à jour des primitives"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
-
-#~ msgid "Conflict detected"
-#~ msgstr "Conflit détecté"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "L’envoi vers l’API OSM a échoué"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitive déjà supprimée"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Les erreurs suivantes sont survenues durant le transfert :"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Restaurer {0} primitives"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Erreur de communication avec le serveur"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Primitives supprimées ou déplacées"
-
-#~ msgid "changeset"
-#~ msgstr "jeu de données"
-
-#~ msgid "changesets"
-#~ msgstr "jeux de données"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Erreur de communication avec le serveur"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "La projection ne peut être lue dans les préférences. Mercator sera "
-#~ "utilisé."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">english</A> ou <A "
-#~ "HREF=\"{1}\">French</A>."
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Suppression d’une primitive"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Le chargement <strong>a échoué</strong> car une primitive que "
-#~ "vous<br>essayez de supprimer sur le serveur est déjà supprimée.<br><br>Le "
-#~ "message d’erreur est :<br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them on "
-#~ "the server the server is likely to report a<br>conflict.<br><br>Click "
-#~ "<strong>{1}</strong> to check these primitives individually.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Il y a {0} primitives dans votre jeu de données local "
-#~ "qui<br>semblent avoir été supprimées sur le serveur. Si vous essayez de "
-#~ "les supprimer<br>ou de les mettre à jour ultérieurement, le serveur vous "
-#~ "renverra probablement un conflit.<br><br>Cliquez <strong>{1}</strong> "
-#~ "pour vérifier ces primitives individuellement.<br>Cliquez <strong>{2}</"
-#~ "strong> pour ignorer.<br></html>"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "paramètre {0} > 0 requis. Reçu {1}."
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Il n’y a pas de primitive de version {0} dans cet historique"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr ""
-#~ "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de "
-#~ "{2}"
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "Pas de primitive d’id {0} et de version {1} trouvée dans ce jeu de données"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "pas de version plus récente trouvée. L’historique est vide."
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ATTENTION : Le mot de passe est stocké en texte clair dans le "
-#~ "fichier de préférences.<br>Le mot de passe est transféré en texte clair "
-#~ "au serveur, encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de "
-#~ "valeur.</b></html>"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Nom d'utilisateur (e-mail) du compte OSM."
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "Nom d'utilisateur OSM (e-mail))"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Echec de l’ouverture de connexion à l’API {0}"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Vous pouvez ajouter, éditer et supprimer des entrées WMS dans l’onglet "
-#~ "des préférences de WMSplugin - ces options s’afficheront dans le menu "
-#~ "WMS.\n"
-#~ "\n"
-#~ "Vous pouvez également effectuer ceci dans les Préférences Avancées, en "
-#~ "utilisant le schéma suivant :\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"
-#~ "Exemple d’URL WMS complète (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Pour le Rectificateur de Carte Metacarta http://labs.metacarta.com/"
-#~ "rectifier/ , vous avez seulement besoin d’entrer le bon ’id’.\n"
-#~ "Pour ajouter l'entrée de menu du Rectificateur de Carte Metacarta, créez "
-#~ "manuellement l'URL comme dans cet exemple, en remplaçant 73 par l’id de "
-#~ "votre image :\n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
-#~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
-#~ "\n"
-#~ "Note : veuillez vous assurer que l'image est utilisable, notamment au "
-#~ "niveau du copyright, dans le doute, ne l'utilisez pas."
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr ""
-#~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\""
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "le paramètre \"{0}\" ne doit pas être vide"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "attribut obligatoire \"{0}\" manquant"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\""
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "format inattendu de nouvelle version d’une primitive modifiée \"{0}\", "
-#~ "reçu \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type long, "
-#~ "reçu \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type "
-#~ "OsmPrimitiveType, reçu \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int "
-#~ "(>=0), reçu \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type booléen, "
-#~ "reçu \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type long "
-#~ "(>=0), reçu \"{1}\""
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, "
-#~ "reçu \"{1}\""
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "ATTENTION : préférence \"{0}\" ou version d’api \"{1}\" du jeu de données "
-#~ "requis pour utiliser les jeux de changement, mais l’API ne les gère pas. "
-#~ "Les jeux de changements seront ignorés."
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synchroniser {0} {1} seulement"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check these primitives individually.<br>Click <strong>{2}</"
-#~ "strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Il y a {0} primitives dans votre jeu de données local "
-#~ "qui<br>peuvent avoir été supprimées sur le serveur. Si vous essayez de "
-#~ "les supprimer ou mettre à jour<br>ultérieurement, le serveur renverra un "
-#~ "conflit.<br><br>Cliquez <strong>{1}</strong> pour vérifier ces primitives "
-#~ "individuellement.<br>Cliquez <strong>{2}</strong> pour annuler.<br></html>"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Aucune donnée à mettre à jour trouvée. Avez-vous ouvert ou téléchargé une "
-#~ "couche de données ?"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "ATTENTION : format d’URL de l’API incorrecte. La redirection vers la page "
-#~ "d’historique des primitives OSM échouera probablement. l’URL de l’API "
-#~ "est : \"{0}\""
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "La longueur de la valeur du champ \"{0}\" de la primitive {1} excède la "
-#~ "longueur maximale autorisée {2}. la longueur actuelle est de {3}."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Le nombre actuel de changements dépasse le maximum autorisé. Nombre "
-#~ "courant : {0}, maximum : {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Impossible d'initialiser l’API. Veuillez réessayer plus tard."
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Attention : troncage automatique de la valeur du champ \"{0}\" sur la "
-#~ "primitive supprimée {1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "Échec d’initialisation de l’API"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Une appartenance à une relation a été copiée à tous les nouveaux "
-#~ "chemins.\n"
-#~ "Vous devriez vérifier cela et le corriger si nécessaire."
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "suppression de la référence du chemin {0}"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Garder une copie de la version locale"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "suppression de la référence de la relation {0}"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "non visible (sur le serveur)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (sur le serveur)"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "La communication avec le serveur a échoué"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Oui, le supprimer"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Pour conserver votre version locale, JOSM<br>doit réinitialiser "
-#~ "l’id de {0} {1} à 0.<br>Lors du prochain envoi le serveur lui assignera "
-#~ "un nouvel id<br>Êtes-vous d'accord ?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Suppression du jeu de données"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Historique de {0} {1}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Afficher l'historique de la primitive sélectionnée"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Version <strong>{0}</strong> créée le <strong>{1}</strong> par "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid "image loading..."
-#~ msgstr "chargement de l’image..."
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "Erreur d'import de TangoGPS !"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Ma primitive d’id {0} et de version {1} est visible bien que leur "
-#~ "primitive de version plus ancienne {2} n’est pas visible. impossible de "
-#~ "résoudre cette contradiction. Je conserve ma primitive. "
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr ""
-#~ "échec de la définition de la référence. la référence de version {0} n’est "
-#~ "pas disponible dans l’historique"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr ""
-#~ "historique non encore initialisé. Impossible de définir la primitive "
-#~ "courante."
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "pas de primitive d’id {0} dans le jeu de données local. Impossible de "
-#~ "déduire le type de primitive"
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "historique pas encore initialisé. Impossible de définir la référence de "
-#~ "la primitive."
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Chargement de l’historique de {0} d’id {1}"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Le serveur a répondu par une erreur 404, nouvelle tentative en utilisant "
-#~ "des requêtes individuelles pour chaque primitive"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>Le greffon openstreetbus utilise l’ancien serveur sur appspot.com."
-#~ "<br>Un nouveau serveur est disponible sur schokokeks.org.<br>Voulez-vous "
-#~ "passer au nouveau serveur ? (fortement recommandé)"
-
-#~ msgid "Visible State:"
-#~ msgstr "État visible :"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Conserver mon état de visibilité"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Supprimer physiquement du jeu de données local"
-
-#~ msgid "History item"
-#~ msgstr "Historique de l’objet"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "index en dehors des limites. Reçu {0}"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflit non résolu entre deux états de visiblité"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Impossible de charger l’historique depuis le serveur. Détails :<br>"
-#~ "{0}</html>"
-
-#~ msgid "failed to set current. current version {0} not available in history"
-#~ msgstr ""
-#~ "impossible de définir l’en-cours. la version actuelle {0} n’est pas "
-#~ "disponible dans l’historique"
-
-#~ msgid ""
-#~ "failed to set reference. reference id {0} doesn't match history id {1}"
-#~ msgstr ""
-#~ "impossible de définir la référence. la référence d’id {0} ne correspond "
-#~ "pas à l'historique d’id {1}"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Changer {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Ajouter {0} {1}"
-
-#~ msgid "No data"
-#~ msgstr "Aucune donnée"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Vous avez déplacer plus de {0} éléments. Le déplacement d'un aussi grand "
-#~ "nombre d'éléments is souvent une erreur.\n"
-#~ "Souhaitez vous les déplacer ?"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "Zone  UTM {0}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus "
-#~ "présent."
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
-
-#~ msgid "Conflict created"
-#~ msgstr "conflit créé"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Supprimer les étiquettes sélectionnées"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "supprimer le membre de la relation {0} {1}"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "le paramètre \"{0}\" ne doit pas être nul"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "effectuer une rotation de {0}{1}"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "un conflit est déjà enregistré pour la primitive \"{0}\""
-
-#~ msgid ""
-#~ "<html>The relation has changed outside of the editor.<br>Your edit can't "
-#~ "be applied directly, a conflict has been created instead.</html>"
-#~ msgstr ""
-#~ "<html>La relation a été modifiée en dehors de l'éditeur.<br />Votre "
-#~ "modification ne peut pas être appliquée directement, un conflit a été "
-#~ "créé à la place.</html>"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copier les valeurs par défaut"
-
-#~ msgid "image "
-#~ msgstr "image "
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Téléchargement des parents des primitives {2}"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Téléchargement des référents..."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflits dans les données"
-
-#~ msgid "Linked"
-#~ msgstr "Lié"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr ""
-#~ "Paramètres par défaut (voir info-bulle pour obtenir des informations "
-#~ "détaillées)"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Ajouter une nouvelle source XML à la liste"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Le serveur a renvoyé une erreur avec le code {0}"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Le plugin {0} n'est pas disponible. Mise à jour annulée."
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Téléchargement des référents depuis OSM..."
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflits durant le téléchargement"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Lecture du fichier \"{0}\" impossible. L’erreur est : <br>{1}</br></"
-#~ "html>"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "Charger tous les changements dans une requête"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant."
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Permettre l'envoi de tous les changements en une requête, désactivez pour "
-#~ "utiliser une requête par primitive modifiée"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Impossible de rechercher car il n’y a pas de données chargées."
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr ""
-#~ "Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : "
-#~ "{0}"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>Les signets ne peuvent être lus.<br>{0}</html>"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
-
-#~ msgid "Confirmation"
-#~ msgstr "Confirmation"
-
-#~ msgid "Delete all"
-#~ msgstr "Tout supprimer"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>La relation enfant<br>{0}<br>est supprimée sur le serveur et ne "
-#~ "peut être chargée."
-
-#~ msgid "No, don't apply"
-#~ msgstr "Non, ne pas l'appliquer."
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Une erreur est survenue lors du chargement d'une sauvegarde."
-#~ "<br>L'erreur est : <br>{0}</html>"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà "
-#~ "désactivé."
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the current projection to one of the cadastre\n"
-#~ "projection and retry"
-#~ msgstr ""
-#~ "Pour activer le greffon WMS du cadastre, changez\n"
-#~ "la projection actuelle vers une du cadastre et réessayez."
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
-#~ "été trouvés."
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Sélectionnez le calque WMS"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Veuillez sélectionner le calque WMS à ajuster."
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Attention : impossible d'afficher une fenêtre de dialogue au premier "
-#~ "plan. L'exception était : {0}"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Il y a des modifications non sauvegardées dans {0} calque. Ignorer les "
-#~ "modifications et continuer ?"
-#~ msgstr[1] ""
-#~ "Il y a des modifications non sauvegardées dans {0} calques. Ignorer les "
-#~ "modifications et continuer ?"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Fermer l'ensemble de changements actuel..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Fermer ensemble de changements actuel"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr ""
-#~ "<html>Il y a des conflits non résolus dans le calque ''{0}''.<br>Vous "
-#~ "devez d'abord les résoudre.<html>"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Utiliser un nouvel ensemble de changements et le laisser ouvert"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "Choisir pour envoyer les données en utilisant un nouvel ensemble de "
-#~ "changements et pour fermer ce dernier après l'envoi"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} objet à modifier :"
-#~ msgstr[1] "{0} objets à modifier :"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Choisir pour envoyer les données en utilisant un nouvel ensemble de "
-#~ "changements et pour le laisser ouvert après l'envoi"
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "Envoyer dans un ensemble de changements nouveau ou préexistant ?"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Résoudre les conflits de version pour le nœud {0}"
-
-#~ msgid "Bikes"
-#~ msgstr "Vélos"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Résoudre les conflits de version pour la relation {0}"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Résoudre les conflits de version pour le chemin {0}"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\"."
-#~ "<br>Enlever de la relation ?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le "
-#~ "rôle {2}.<br>Enlever de la relation ?</html>"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Choisissez les valeurs à conserver"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "note : pour certaines tâches, JOSM requiert beaucoup de mémoire. Il est "
-#~ "peut-être nécessaire d'ajouter l'option Java \n"
-#~ "      pour augmenter la taille maximale de mémoire allouée"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la laisser "
-#~ "ouverte pour d'autres envois."
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la fermer après "
-#~ "l'envoi."
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Envoyer avec la session de modification existante {0} et la fermer après "
-#~ "cet envoi."
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr ""
-#~ "Utiliser la session de modification existante {0} et la conserver ouverte."
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Attention : La couche ''{0}'' n'existe plus. Impossible de supprimer le "
-#~ "conflit pour l'élément ''{1}''"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "La suite d’attributs ne comprend pas la valeur sélectionnée « {0} »"
-
-#~ msgid "white"
-#~ msgstr "blanc"
-
-#~ msgid "blue"
-#~ msgstr "bleu"
-
-#~ msgid "red"
-#~ msgstr "rouge"
-
-#~ msgid "brown"
-#~ msgstr "marron"
-
-#~ msgid "black"
-#~ msgstr "noir"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "Impossible d'ajouter le nœud {0} au chemin incomplet {1}"
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "La clé \"{0}\" et toutes ses valeurs vont être supprimées."
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
-
-#~ msgid "not yet decided"
-#~ msgstr "Pas encore décidé."
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>Il y a au moins un membre de cette relation qui réfère<br>à la "
-#~ "relation elle-même.<br>Ceci crée des dépendances circulaires et est "
-#~ "déconseillé.<br>Comment voulez-vous procéder avec les dépendances "
-#~ "circulaires ?</html>"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Sauvegarder et supprimer."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Man-Made"
-#~ msgstr "Artificiel"
-
-#~ msgid "Travel"
-#~ msgstr "Voyage"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A "
-#~ "HREF=\"{1}\">votre langage</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus "
-#~ "présent."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Pas de primitive d’id {0} trouvée dans ce jeu de données"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A> ou <A "
-#~ "HREF=\"{1}\">French</A>."
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "ATTENTION : ouverture des fenêtres du navigateur pour les {0} sur {1} "
-#~ "primitives sélectionnées uniquement."
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "Text"
-#~ msgstr "Texte"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
+#~ "Attention : l’exception est ignorée car la tache a été annulée. "
+#~ "Exception : {0}"
 
 #~ msgid ""
 #~ "<html>An upload and/or save operation of one layer with "
-#~ "modifications<br>was cancelled or has been failed.</html>"
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Un envoi et/ou une sauvegarde d’un calque avec modifications<br>a "
+#~ "été interrompu ou a échoué.</html>"
+#~ msgstr[1] ""
+#~ "<html>Des envois et/ou des sauvegardes de {0} calques avec "
+#~ "modifications<br>ont été interrompus ou ont échoué.</html>"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "<html>Une opération d'envoi et/ou de sauvegarde d'un calque avec des "
-#~ "modifications<br>a été annulé ou a échoué.</html>"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Ouvrir un nouvel ensemble de changements"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Utiliser ensemble de changements ouvert"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Envoyer les données vers un ensemble de changements déjà ouvert"
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "L'id de l'ensemble de changements doit être supérieur à 0. Reçu {0}"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "valeur inattendue retournée. Reçue {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Il n’y a pas de primitive de version {0} dans cet historique"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
+#~ "Attention : l’ouverture du flux d’entré pour la ressource \"/data/{0}\" a "
+#~ "échoué. Impossible de charger le réseau NTF<->RGF93."
+
+#~ msgid ""
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "pas de version plus récente trouvée. L’historique est vide."
+#~ "Remplacer le fond blanc original par la couleur définie dans les "
+#~ "préférences."
 
 #~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
+#~ "configurable because it is referenced by external applications talking to "
+#~ "JOSM."
 #~ msgstr ""
-#~ "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "paramètre en dehors de la plage : reçu {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
+#~ "JOSM écoutera toujours sur le port 8111. Ce port n’est pas "
+#~ "personnalisable car il est utilisé par les applications communiquant avec "
+#~ "JOSM."
+
+#~ msgid "Change values?"
+#~ msgstr "Modifier les valeurs"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Permet de filtrer les traces GPS inutiles"
+
+#~ msgid "Supicious data found. Upload anyway?"
 #~ msgstr ""
-#~ "Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
-#~ "commande de résolution"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "index de colonne inattendu. Reçu {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
+#~ "Des données suspectes ont été trouvées. Voulez-vous continuer l’envoi ?"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Télécharger et mettre à jour"
+
+#~ msgid ""
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
-#~ "commande de résolution"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "La suite d’attributs ne comprend pas la valeur sélectionnée « {0} »"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "index en dehors des limites. Reçu {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Afficher l'historique de la primitive sélectionnée"
+#~ "(définir ''{0}'' sur oui/non/demander dans les préférences\n"
+#~ "pour le chargement automatique des fichiers)"
 
 #~ msgid ""
-#~ "Hailed to set reference. Reference ID {0} does not match history ID {1}."
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "impossible de définir la référence. la référence d’id {0} ne correspond "
-#~ "pas à l'historique d’id {1}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Impossible de lire \"{0}\""
+#~ "Définir ''{0}'' sur oui/non/demander dans les préférences\n"
+#~ "pour le chargement automatique des fichiers."
 
 #~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "pas de primitive d’id {0} dans le jeu de données local. Impossible de "
-#~ "déduire le type de primitive"
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "préférence \"{0}\" manquante. Impossible d’initialiser OsmApi"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, "
-#~ "reçu \"{1}\""
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int "
-#~ "(>=0), reçu \"{1}\""
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Impossible de joindre le serveur OSM. Veuillez vérifier votre "
-#~ "connectivité Internet."
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} conflit(s) d’attribut à résoudre"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr ""
-#~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs."
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html>Version <strong>{0}</strong> créée le <strong>{1}</strong> par "
-#~ "<strong>{2}</strong> dans l’ensemble de changements <strong>{3}</strong></"
-#~ "html>"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Veuillez d’abord saisir les coordonnées désirées."
-
-#~ msgid "tower"
-#~ msgstr "pylônes"
-
-#~ msgid "any substance"
-#~ msgstr "toute substance"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relations constituent une boucle car elles réfèrent l'une à "
-#~ "l'autre.<br>JOSM ne peut les envoyer. Veuillez éditer les relations et "
-#~ "enlever les dépendances en boucle.</html>"
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr ""
-#~ "Envoyer tout les changements dans la sélection actuelle vers les serveurs "
-#~ "d'OSM."
-
-#~ msgid "Update selections"
-#~ msgstr "Actualiser les éléments sélectionnés"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Actualise les éléments du calque courant depuis le serveur."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Envoyer tout les changements dans le calque courant vers le serveur d'OSM"
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "Pas de type trouvé. L'historique est vide."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Appliquer aussi pour les enfants"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Objet purgé ''{0}''"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Le téléchargement a <strong>échoué</strong>parce que vous utilisé "
-#~ "le<br>changeset n° {0} qui a été fermé à  {1}.<br>veuillé télécharger de "
-#~ "nouveau avec un nouveau changeset ou avec un changeset existant.</html>"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Objets ''{0}'' purgés"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "{0} objets ajoutés"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossible d’annuler la commande « {0} » parce que la couche « {1} » "
-#~ "n’est plus présente"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible."
-
-#~ msgid "gray"
-#~ msgstr "gris"
-
-#~ msgid "create new objects"
-#~ msgstr "créer de nouveaux objets"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Impossible de lire le fichier « {0} ».<br> L’erreur est : <br>{1}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Zone actuelle de téléchargement</strong> (minlat,minlon, "
-#~ "maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Roulette, double-clic ou Ctrl + Haut/Bas\r\n"
-#~ "<b>Déplacer la carte:</b> Maintenir le clic droit et bouger la souris ou "
-#~ "utiliser les touches directionnelles.\r\n"
-#~ "<b>Sélectionner:</b> Maintenir le clic gauche et dessiner un rectangle."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Veuillez redémarrer JOSM."
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Glisser un segment de chemin pour faire un rectangle. Ctrl-glisser pour "
-#~ "déplacer un segment le long de sa normale."
-
-#~ msgid "Could not create a node with the entered latitude/longitude."
-#~ msgstr ""
-#~ "Impossible de créer un nœud avec les valeurs de latitude/longitude "
-#~ "données."
-
-#~ msgid "Illegal lat/lon value"
-#~ msgstr "Valeurs de latitude/longitude incorrectes"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (France)"
-
-#~ msgid "Downloading relation ''{0}''"
-#~ msgstr "Téléchargement de la relation ''{0}''"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} Greffon chargé avec succès."
-#~ msgstr[1] "{0} Greffons chargés avec succès."
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "Le chargement du greffon {0} a été demandé. Ce greffon n'est plus "
-#~ "nécessaire."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Vous devez sélectionner au moins deux chemins."
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Veuillez entrer une latitude entre -90° et 90°"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Veuillez entrer une longitude valide entre -180° et 180°"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Veuillez entrer une latitude valide entre -90° et 90°"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Veuillez entrer une longitude entre -180° et 180°"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contact de {0}…"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>… - objet avec le nombre de nœuds spécifié"
-
-#~ msgid "Downloading..."
-#~ msgstr "Téléchargement…"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Configurer les sites…"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Préparation des données…"
-
-#~ msgid "Preparing..."
-#~ msgstr "Préparation en cours…"
-
-#~ msgid "Uploading..."
-#~ msgstr "Envoi en cours…"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr ""
-#~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les "
-#~ "données."
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Vous êtes sur le point de lancer {0} fenêtres de navigateur.<br>Ceci "
-#~ "pourrait remplir votre écran de fenêtres<br>et pourrait prendre un "
-#~ "certain temps pour finir l'affichage."
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Fermer la boîte de dialogue sans créer de nouveau nœud"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "requis : Id > 0 obtenu : {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "le paramètre \"{0}\" ne doit pas être nul."
-
-#~ 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 ""
-#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la "
-#~ "zone téléchargée.\n"
-#~ "Certains nœuds utilisés en dehors de la zone pourraient être supprimés "
-#~ "accidentellement.\n"
-#~ "Voulez-vous vraiment continuer ?"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr ""
-#~ "Sélectionner si les données doivent être téléchargées dans un nouveau "
-#~ "calque"
-
-#~ 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} voie. Êtes-vous sûr de vouloir le simplifier ?"
-#~ msgstr[1] ""
-#~ "La sélection contient {0} voies. Êtes-vous sûr de vouloir tous les "
-#~ "simplifier ?"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Aucun des nœuds de cette voie ne sont collés à autre chose."
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr ""
-#~ "L'objet avec l'identifiant {0} n'a pas été trouvé dans le jeu de données "
-#~ "actuel"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Cliquer pour supprimer. Maj : supprimer le segment de voie. Alt : Ne pas "
-#~ "supprimer les nœuds non utilisés lors de la suppression de la voie. "
-#~ "Ctrl : supprimer tous les objets utilisant cet objet."
-
-#~ msgid "Missing right parent"
-#~ msgstr "Parent correct manquant"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Ouverture de {0} fichiers…"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Il manque la parenthèse droite"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Flag 'modified' positionné pour le noeud {0}"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Flag 'modified' positionné pour le chemin {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Flag 'modified' positionné pour la relation {0}"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr ""
-#~ "Les valeurs négatives indiquent la partie Ouest/Sud de l’hémisphère."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Basculer l’affichage plein écran"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr ""
-#~ "<html>Impossible d’ouvrir un dossier.<br>Veuillez sélectionner un "
-#~ "fichier !"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Il y a des conflist non résolus dans le calque ''{0}''.<br>Vous "
-#~ "devez les résoudre d’abord.</html>"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "La zone n’est pas fermée."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Plus d’un chemin d’origine trouvé."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Pas de chemin d’origine trouvé."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Conserver l’état de visbilité du serveur"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>La relation enfant<br>{0}<br>est supprimée sur le serveur et ne "
-#~ "peut être chargée."
-
-#~ msgid "GPS point"
-#~ msgstr "Point GPS"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Colorier les points et segments de traces par coefficient "
-#~ "d’affaiblissement de la précision (HDOP). Votre outil de capture doit "
-#~ "enregistrer cette information."
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Index de direction ''{0}'' non trouvé"
-
-#~ msgid "Fade background: "
-#~ msgstr "Pâlissement graduel de l’arrière plan : "
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Touche dupliquée pour le bouton ''{0}'' - le bouton sera ignoré !"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Sélectionnez un seul chemin fermé d’au moins quatre points."
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Vous êtes sur le point de supprimer des nœuds en dehors de la zone "
-#~ "téléchargée. <br>Cela peut poser problème car d’autres objets (que vous "
-#~ "ne voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les "
-#~ "supprimer ?"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Il n’y a actuellement pas de calque WMS à ajuster."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Affiche une image d’arrière plan provenant d’OpenLayers"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Nombre incorrect de paramètres pour l'opérateur d'attributs."
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Valeur incorrecte pour l'opérateur d'attributs: {0}. L'opérateur "
-#~ "d'attributs attends le numéro de l'attribut ou une plage, par exemple "
-#~ "tags:1 ou tags:2-5"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Pas de nœud ou de chemin \"via\" trouvé."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Le chemin \"to\" ne commence ou ne fini pas par un nœud \"via\"."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr ""
-#~ "Déplacer les nœuds afin que tous les angles soient de 90 ou 270 degrés"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>Impossible d'ouvrir le dossier.<br>Veuillez choisir un fichier !</"
-#~ "html>"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "A fusionné une aire superposée sur elle-même"
-
-#~ msgid "<number>"
-#~ msgstr "<nombre>"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "Use all their elements"
-#~ msgstr "Utiliser tous leurs éléments"
-
-#~ msgid ""
-#~ "Cannot open {0} file because no suitable file importer is available. "
-#~ "Skipping the following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files because no suitable file importer is available. "
-#~ "Skipping the following files:"
-#~ msgstr[0] ""
-#~ "Aucun outil d'importation n'est disponible pour importer le fichier "
-#~ "suivant, qui sera ignoré :"
-#~ msgstr[1] ""
-#~ "Aucun outil d'importation n'est disponible pour importer les {0} fichiers "
-#~ "suivants, qui seront ignorés :"
-
-#~ msgid ""
-#~ "Cannot open {0} file with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgstr[0] ""
-#~ "L'outil d'importation \"{1}\" ne permet pas d'importer le fichier "
-#~ "suivant, qui sera ignoré :"
-#~ msgstr[1] ""
-#~ "L'outil d'importation \"{1}\" ne permet pas d'importer les {0} fichiers "
-#~ "suivants, qui seront ignorés :"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "trace"
-#~ msgstr[1] "traces"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "randonnée alpine exigeante"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "randonnée alpine difficile"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "randonnée alpine"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "randonnée en montagne"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "randonnée en montagne exigeante"
-
-#~ msgid "loading plugin ''{0}''"
-#~ msgstr "chargement du greffon \"{0}\""
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Utiliser les degrés décimaux"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Chemins dupliqués avec un décalage"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr ""
-#~ "Seulement pour les directions intéressantes (sens unique par exemple)"
-
-#~ msgid "Football"
-#~ msgstr "Football américain"
-
-#~ msgid "football"
-#~ msgstr "football américain"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Garder les fichiers de sauvegarde"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Pile de commandes : {0}"
-
-#~ msgid "loading plugin ''{0}'' ({1})"
-#~ msgstr "chargement du greffon ''{0}'' ({1})"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Modifier un sport mécanique"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Nœuds non connectés et sans attribut"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Sources des tuiles"
-
-#~ msgid "Used style"
-#~ msgstr "Modèle utilisé"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Modèles disponibles (depuis {0})"
-
-#~ msgid "Active styles"
-#~ msgstr "Modèles actifs"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr ""
-#~ "Le modèle du chemin intérieur \"{0}\" est équivalent à un multipolygone."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Le modèle de la restriction {0} n’a pas été trouvé."
-
-#~ msgid "Motor Sports"
-#~ msgstr "Sport mécanique"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "Système géodésique UTM Nord fuseau 20"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Le marque-page ne peut être écrit.<br>{0}</html>"
-
-#~ msgid "Edit Football"
-#~ msgstr "Modifier le football américain"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Modifier le rugby"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Les multipolygones doivent uniquement contenir des chemin fermés."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Objet n'étant pas un chemin dans le multipolygone"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Veuillez entrer un commentaire sur ce groupe de modifications (minimum 3 "
-#~ "caractères)"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" n’est pas fermé et ne peut donc pas être joint."
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Joindre les aires : supprimer les chemins courts"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr ""
-#~ "Seulement deux aires au maximum peuvent être jointes pour le moment."
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Cible de fusion manquante pour l’objet avec l’identifiant {0}"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Fournir un calque d’arrière plan en affichant une grille"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Permet un contrôle de JOSM par d’autres applications."
-
-#~ msgid ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-#~ msgstr ""
-#~ "<html>Le téléchargement de la donnée a échoué. Son format n’est plus "
-#~ "supporté, mal-formé et/ou incohérent.<br><br>Détails (non traduits) : {0}"
-#~ "</html>"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Permet à d’autres applications d’envoyer des commandes vers JOSM."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Vérifie les erreurs dans les données et corrige les plus simples. Un "
-#~ "vérificateur orthographique est intégré pour les attributs."
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Attention : suppression du chemin {0} car le nombre de ses nœuds est "
-#~ "inférieur à 2. Actuellement il est de {1}"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Attention : l’analyse des modèles Mappaint depuis de ''{0}'' a échoué. "
-#~ "Exception : {1}"
-
-#~ msgid "Icon paths"
-#~ msgstr "Répertoires d’icônes"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Affichage plein écran"
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Sélectionner automatiquement le premier calque WMS lors du téléchargement "
-#~ "du cadastre."
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Entrer un commentaire d’envoi (min. 3 caractères)"
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Le chemin intérieur du multipolygone est à l’extérieur."
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans la liste "
-#~ "des marque-pages du serveur"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Erreur de syntaxe du motif : le motif {0} dans {1} est erroné !"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} conflit a été <strong>résolu automatiquement</strong> en enlevant {0} "
-#~ "objet<br>du jeu de données car il était supprimé sur le serveur."
-#~ msgstr[1] ""
-#~ "{0} conflits ont été <strong>résolus automatiquement</strong> en enlevant "
-#~ "{0} objets<br>du jeu de données car ils étaient supprimés sur le serveur."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Le greffon Remote Control écoute sur le port 8111 de l’hôte local. Le "
-#~ "port ne peut pas être changé car il est référencé par les applications "
-#~ "communiquant avec le greffon."
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "Confirmez toutes les actions de Remote Control manuellement"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Paramètres du greffon Remote Control"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "La balise \"{0}-{1}\" est endommagée - le nombre d’éléments dans "
-#~ "display_values doit être le même que dans les valeurs"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Plus d’un chemin \"via\" trouvé."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"."
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Insérer des objets \"via\" depuis le presse-papier"
-
-#~ msgid "Goods"
-#~ msgstr "Transport de marchandises"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Voie fluviale"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Le chemin \"from\" ne commence ou ne fini pas par un nœud \"via\"."
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Combinaison attribut/valeur erronée"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Veuillez entrer les coordonnées du nouveau nœud."
-
-#~ msgid "Edit new turn restriction in layer ''{0}''"
-#~ msgstr ""
-#~ "Modifier une nouvelle interdiction de tourner dans le calque ''{0}''"
-
-#~ msgid "Create new turn restriction in layer ''{0}''"
-#~ msgstr "Créer une nouvelle interdiction de tourner dans le calque ''{0}''"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Suppression de la référence dans la relation {0}"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Le chargement du greffon {0} a échoué car<br>la classe principale "
-#~ "''{1}''du greffon n’a pas été trouvée.<br>Le supprimer des préférences ?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "{0} primitive se rapportant à la relation {1}<br>a été supprimée sur le "
-#~ "serveur.<br>Voulez-vous récupérer cette primitive ?"
-#~ msgstr[1] ""
-#~ "{0} primitives se rapportant à la relation {1}<br>ont été supprimées sur "
-#~ "le serveur.<br>Voulez-vous récupérer ces primitives ?"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "{0} nœud utilisé sur le chemin {1}<br>a été supprimé sur le serveur."
-#~ "<br>Voulez-vous récupérer ce nœud ?"
-#~ msgstr[1] ""
-#~ "{0} nœuds utilisés sur le chemin {1}<br>ont été supprimé sur le serveur."
-#~ "<br>Voulez-vous récupérer ces nœuds ?"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Contenu d’aide pour sujet manquant</"
-#~ "p><p class=\"warning-body\">Un contenu d’aide pour le sujet <strong>{0}</"
-#~ "strong> n’est pas encore disponible ni dans votre langue ({1}) ni en "
-#~ "anglais.<br>Merci d’améliorer le système d’aide de JOSM en remplissant "
-#~ "les informations manquantes. Vous pouvez modifier l’<a href=\"{2}\">aide "
-#~ "dans votre langue ({1})</a> et l’<a href=\"{3}\">aide en anglais</a>.</"
-#~ "p></html>"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Il y a {0} primitives dans votre jeu de données local "
-#~ "qui<br>semblent supprimées du serveur. Si vous tentez ultérieurement de "
-#~ "les supprimer ou<br>de les mettre à jour, le serveur retournera "
-#~ "probablement un<br>conflit.<br>Cliquez sur <strong>{1}</strong> pour "
-#~ "vérifier l’état de ces primitives<br>sur le serveur.<br>Cliquez sur "
-#~ "<strong>{2}</strong> pour ignorer.<br></html>"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflit reste non résolu.<br>Veuillez ouvrir la fenêtre Listes des "
-#~ "conflits pour le résoudre manuellement."
-#~ msgstr[1] ""
-#~ "{0} conflits restent non résolus.<br>Veuillez ouvrir la fenêtre Listes "
-#~ "des conflits pour les résoudre manuellement."
-
-#~ msgid "Grab buildings"
-#~ msgstr "Télécharger les bâtiments"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Télécharger le calque des bâtiments uniquement"
-
-#~ msgid "Edit turn restriction #{0} in layer ''{1}''"
-#~ msgstr "Modifier l’interdiction de tourner N°{0} dans le calque ''{1}''"
-
-#~ msgid "Indipend."
-#~ msgstr "Indépendant"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Niveau de zoom minimum : "
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Carte topographique Terraserver"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Crée des multipolygones en un clic plus facilement qu’avec l’éditeur de "
-#~ "relation."
-
-#~ msgid "No username provided."
-#~ msgstr "Aucun nom d’utilisateur fourni."
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Réinitialisation de l’identifiant à 0"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Oui, réinitialiser l’identifiant"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Pour garder votre version locale, JOSM<br>doit remettre "
-#~ "l’identifiant de la primitive  {0} à 0.<br>Le serveur lui assignera un "
-#~ "nouvel identifiant<br>au prochain envoi<br>Êtes-vous d’accord ?</html>"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Envoi de {0} objets..."
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Ni <strong>{0}</strong> ni <strong>{1}</strong> n’est coché."
-#~ "<br>Veuillez choisir le téléchargement des données OSM, des données GPX, "
-#~ "ou des deux.</html>"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Affiche des images géoréférencées en fond d’écran (serveurs WMS, Yahoo…)."
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM doit supprimer votre primitive locale avec l’identifiant {0}"
-#~ "<br>du jeu de données.<br>Êtes-vous d’accord ?</html>"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Commentaire de l’envoi erroné"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Le modèle du chemin extérieur \"{0}\" ne correspond pas."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Attention :</strong> le mot de passe est transféré <strong>une "
-#~ "seule fois</strong> en clair au serveur OSM. <strong>N’utilisez pas</"
-#~ "strong> un mot de passe sensible jusqu’à ce que le serveur fournisse un "
-#~ "canal de communication crypté (HTTPS)."
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Une erreur est survenue lors de la communication avec le "
-#~ "serveur<br>Détails :{0}</html>"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Une exception est survenue"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Charge l’étalonnage des données vers un fichier"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Cette option requiert un cadastre spécial\n"
-#~ "Calques des bâtiments et un calque OSM."
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Hauteur maximale (mètres)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Largeur maximale (mètres)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Longueur maximale (mètres)"
-
-#~ msgid "underwater"
-#~ msgstr "sous-marine"
-
-#~ msgid "overground"
-#~ msgstr "aérienne"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr ""
-#~ "Erreur : ligne ''{0}'' inattendue dans le fichier des marque-pages du "
-#~ "serveur"
-
-#~ msgid "line"
-#~ msgstr "à haute tension"
-
-#~ msgid "minor_line"
-#~ msgstr "à basse tension"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Afficher/Masquer le texte/lesicônes"
-
-#~ msgid "Set width of building"
-#~ msgstr "Définir la largeur des bâtiments"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Point opposé du bâtiment"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Point de l’angle du bâtiment à partir duquel dessiner"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Le chargement des marque-pages depuis ''{0}'' a échoué pour des raisons "
-#~ "de sécurité. Exception : {1}"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Extraire le bâtiment en un clic (images vectorielles uniquement)"
-
-#~ msgid "Image not created properly."
-#~ msgstr "L’image n’a pas été créée correctement."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Plus d’un chemin \"to\" trouvé."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Pas de chemin \"to\" trouvé."
-
-#~ msgid "Download Object..."
-#~ msgstr "Téléchargement de l’objet..."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Chercher les objets multilingues dont l’attribut 'name' n’a pas "
-#~ "d’équivalent dans les attributs 'name: *' et qui n’est pas une "
-#~ "composition d’attributs, par exemple : Italia - Italie - Italy."
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "L’objet cible avec l’identifiant {0} et la version {1} est visible alors "
-#~ "que l’objet source avec la version {2} n’est pas visible. Impossible de "
-#~ "gérer cette incohérence. L’objet cible est gardé. "
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Télécharger la zone sélectionnée"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Glisser pour déplacer les objets. Maj pour ajouter à la sélection (Ctrl "
-#~ "pour basculer). Ctrl-Maj pour faire pivoter la sélection. Ou changer la "
-#~ "sélection."
-
-#~ msgid "Errors during Download"
-#~ msgstr "Erreurs lors du téléchargement"
-
-#~ msgid "Create a new map."
-#~ msgstr "Créer une nouvelle carte"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Sélectionner, déplacer et faire pivoter des objets"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "URL du service WMS (par défaut)"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Modifier la liste des serveurs WMS affichée dans le menu WMS."
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Entrer un nom pour la carte et une URL pour le service WMS"
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Ajouter un chemin OSM avec le rôle \"Depuis\""
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr ""
-#~ "SVP utiliser l'éditeur de base et choisissez manuellement un chemin OSM"
-
-#~ msgid "tagged"
-#~ msgstr "Etiqueté"
-
-#~ msgid "Splits the way"
-#~ msgstr "Séparer les chemins"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Cette interdiction de tourner utilise le noeud OSM <span class=\"object-"
-#~ "name\">{0}</span> comme membre avec le rôle <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Cette interdiction de tourner utilise la relation OSM <span class="
-#~ "\"object-name\">{0}</span> comme membre avec le rôle <tt>{1}</tt>."
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Un chemin OSM est requis à la place."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Passer dans l'éditeur basic et sélectionner un chemin OSM"
-
-#~ msgid ""
-#~ "The turnrestrictions plugin allows to create and edit turn restrictions "
-#~ "in the OpenStreetMap database."
-#~ msgstr ""
-#~ "Le greffon turnrestrictions permet de créer et de gérer des interdictions "
-#~ "de tourner dans la base de données OpenStreetMap."
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Filtre Masqué: {0} Désactivé: {0}"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Un chemin avec le rôle <tt>to</tt> est nécessaire dans une interdiction "
-#~ "de tourner."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Un chemin avec le rôle <tt>from</tt> est nécessaire dans une interdiction "
-#~ "de tourner."
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Ajouter un chemin avec le rôle ''to''"
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Vous êtes sur le point de supprimer des objets incomplets.<br>Cela posera "
-#~ "des problèmes car vous ne voyez pas les vrais objets.<br>Voulez-vous "
-#~ "vraiment supprimer?"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Bienvenue dans le greffon</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> <br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...ou plutot le bien nommé <br>\n"
-#~ "Greffon <span style=\"font-size: large;\">AlignWayS(egments) [NDT] "
-#~ "(Aligne Segments de Chemins)</span>...</span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "Vous ne pouvez pas aligner deux segments qui sont connectés.\n"
-#~ "S'il vous plait, choisissez  deux segments qui ne partagent aucun nœud."
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "La cible de type {0} avec un id {1} est une version invalide"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "Aligner générerait des nœuds situés hors des limites de la planète. Votre "
-#~ "action est annulée."
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "Pointez le coin du bâtiment pour commencer à dessiner"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "Le script enfant a retourné des données invalides."
-
-#~ msgid "forward"
-#~ msgstr "avance"
-
-#~ msgid "play/pause"
-#~ msgstr "jouer/pause"
-
-#~ msgid "backward"
-#~ msgstr "recule"
-
-#~ msgid "slower"
-#~ msgstr "plus lent"
-
-#~ msgid "faster"
-#~ msgstr "plus rapide"
-
-#~ msgid "Building tag:"
-#~ msgstr "Attribut de bâtiment :"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr ""
-#~ "Impossible de lire les données OSM sauvegardées automatiquement ({0}) - "
-#~ "{1}"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM a trouvé {0} calques de données OSM non sauvegardées. Il semblerait "
-#~ "que JOSM a planté la dernière fois. Souhaitez-vous restaurer les données ?"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (mirroir)"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Aligner les segments.</b> Appuyez sur <b><i><span style=\"color:"
-#~ "green\">Shift-A</span></i></b>. Sinon, vous pouvez trouver la commande "
-#~ "dans le menu\n"
-#~ " <b>Outils</b> ou pouvez vouloir placer l'action dans la <b>barre "
-#~ "d'outils</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid "read protocol version"
-#~ msgstr "version du protocole de lecture"
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Éditeur Seamark"
-
-#~ msgid "Edit OpenSeaMap"
-#~ msgstr "Éditer OpenSeaMap"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Impossible de faire correspondre le lien ou l’identifiant au service "
-#~ "sélectionné. Veuillez réessayer."
-
-#~ msgid "import data from URL"
-#~ msgstr "import de données à partir de l'URL"
-
-#~ msgid "Internal style"
-#~ msgstr "Style interne"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Aligner les segments.</b> Appuyez <b><i><span style=\"color:green"
-#~ "\">"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Calque WMS sans nom"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "Ajouter une url de WMS"
-
-#~ msgid "Add relation"
-#~ msgstr "Ajouter la relation"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr ""
-#~ "Le niveau de zoom n'était pas suffisant pour enregistrer un décalage "
-#~ "précisément"
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "Le chemin OSM <span class=\"object-name\">{0}</span> ayant le rôle <tt>{1}"
-#~ "</tt> devrait être scindé au niveau du nœud <span class=\"object-name\">"
-#~ "{2}</span>, où il se connecte au chemin <span class=\"object-name\">{3}</"
-#~ "span>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Cette interdiction de tourner utilise le chemin OSM <span class=\"object-"
-#~ "name\">{0}</span> avec le rôle <tt>from</tt> <strong>et</strong> avec le "
-#~ "rôle <tt>to</tt>. Cependant, dans une interdiction de tourner, le chemin "
-#~ "ayant pour rôle <tt>from</tt> devrait être différent de celui ayant le "
-#~ "rôle <tt>to</tt>."
-
-#~ msgid "jump"
-#~ msgstr "Passer"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "veuillez entrer le timecode GPS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Veuillez ajuster le calque WMS manuellement en utilisant des objets/"
-#~ "traces/etc. connus exactement avant de commencer à cartographier"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "La projection actuelle est {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "changer la projection de {0} à {1}"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "set {0}"
-#~ msgstr "mettre {0}"
-
-#~ msgid "Load file"
-#~ msgstr "Charger un fichier."
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "Cartographie des marqueurs maritimes"
-
-#~ msgid "Seamarks"
-#~ msgstr "Marqueurs maritimes"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "Impossible d'initialiser la télécommande."
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Autoriser la télécommande (nécessite le plugin remotecontrol)"
-
-#~ msgid "farmland"
-#~ msgstr "Terres arables"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "remplacé par le greffon {0}"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Attention : conflit d’attributs inattendu"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Simplifier la zone (supprimer {0} nœud)"
-#~ msgstr[1] "Simplifier la zone (supprimer {0} nœuds)"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Ce calque ne supporte aucune des projections de JOSM, \n"
-#~ "aussi vous ne pouvez pas l’utiliser. Ce message ne sera plus affiché."
-
-#~ msgid ""
-#~ "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to "
-#~ "grab."
-#~ msgstr ""
-#~ "Ajouter le(s) tableau(x) d’assemblage dans la liste des feuilles de "
-#~ "cadastre."
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Modèles disponibles (de {0}) :"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Ajouter l’URL ou le nom d’un modèle"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Activer les valeurs par défaut"
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Niveau de zoom maximum : "
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Ouvrir la page d’aide du wiki dans le navigateur"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Conflit de l’attribut 'visible' appartenant à l’objet de type {0} ayant "
-#~ "pour identifiant {1}"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Il semble que JOSM ait été arrêté brutalement la dernière fois. Voulez-"
-#~ "vous restaurer les données ?"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Projection ''{0}'' non trouvée"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Remplacer par la liste WMS"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "Il y a {0} paramètres WMS inconnus"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr ""
-#~ "Migration des paramètres d’imagerie : conflit avec le tableau {0} -> {1}"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Migration des paramètres d’imagerie : conflit avec la propriété {0} -> {1}"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Liste des calques WMS :"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Paramètres WMS :"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Migration des paramètres d’imagerie"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Garder les paramètres actuels"
-
-#~ msgid "Close bug"
-#~ msgstr "Fermer le rapport d’erreur"
-
-#~ msgid "Add comment"
-#~ msgstr "Ajouter un commentaire"
-
-#~ msgid "Re-open bug"
-#~ msgstr "Réouvrir le rapport d’erreur"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "Invalider le rapport d’erreur"
-
-#~ msgid "Privacy"
-#~ msgstr "Confidentialité"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Meilleur zoom : {0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Échelle de pixel : {0}"
-
-#~ msgid "Internal Style"
-#~ msgstr "Style interne"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "Impossible de sélectionner un nœud isolé"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Clic gauche : désélectionner le nœud"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Fusion du contour"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Clic gauche : sélectionner le nœud"
-
-#~ msgid "Left-Click: on node to select/unselect; Drag: drag way slice"
-#~ msgstr ""
-#~ "Clic gauche : sur un nœud pour le sélectionner/désélectionner ; "
-#~ "Glissement : faire glisser une portion de chemin"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "Veuillez au préalable entrer un nom de fichier."
-
-#~ msgid "Run the script"
-#~ msgstr "Exécuter le script"
-
-#~ msgid "Run"
-#~ msgstr "Exécuter"
-
-#~ msgid "Empty file name"
-#~ msgstr "Effacer le nom de fichier"
-
-#~ msgid "File:"
-#~ msgstr "Fichier :"
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "Entrez le nom du fichier de script"
-
-#~ msgid "Run a script"
-#~ msgstr "Exécuter un script"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr ""
-#~ "Sélectionnez un fichier de script et cliquez sur <strong>Exécuter</"
-#~ "strong>."
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Niveau de zoom actuel : {0}"
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "Impossible de lire la macro du fichier ''{0}''."
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "Impossible de lire le script du fichier ''{0}''."
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr ""
-#~ "Attention: impossible de charger les \"mime types\" du fichier ''0''."
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
-#~ msgstr ""
-#~ "Attention: impossible de charger les \"mime types\" de la ressource ''0''."
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Please select a scripting engine to execute the selected script."
-#~ msgstr ""
-#~ "Veuillez sélectionner un moteur de script pour exécuter le script "
-#~ "sélectionné."
-
-#~ msgid "Select a script"
-#~ msgstr "Sélectionner un script"
-
-#~ msgid "Script Error"
-#~ msgstr "Erreur de script"
-
-#~ msgid "Scripting"
-#~ msgstr "Scriptage"
-
-#~ msgid "Configure..."
-#~ msgstr "Configuration..."
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "Configurer les préférences de script"
-
-#~ msgid "cancel"
-#~ msgstr "annuler"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "Accepter le moteur de script sélectionné"
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "''{0}'' est un répertoire. Sélectionner plutôt un fichier jar."
-
-#~ msgid "Contour Merge"
-#~ msgstr "Fusion de contour"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Remplacer par les paramètres WMS"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr "Vérifier si des chemins ont les mêmes coordonnées et attributs."
-
-#~ msgid "Language:"
-#~ msgstr "Langue :"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "Ajouter un nouveau fournisseur"
-
-#~ msgid "remove entry"
-#~ msgstr "Supprimer le fournisseur"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Veuillez entrer votre nom d’utilisateur et votre mot de passe OSM. Le mot "
-#~ "de passe <strong>ne sera pas</strong> enregistré en clair dans les "
-#~ "préférences et il sera transmis au serveur OSM <strong>une seule fois</"
-#~ "strong>. Les requêtes pour l’envoi des données n’utiliseront plus votre "
-#~ "mot de passe."
-
-#~ msgid "Download Object"
-#~ msgstr "Télécharger l’objet"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Entrez un mot à rechercher :"
-
-#~ msgid "parking_lot"
-#~ msgstr "parking"
-
-#~ msgid "sidewalk"
-#~ msgstr "trottoir"
-
-#~ msgid "lane"
-#~ msgstr "route"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "Ne pas utiliser de relation pour les adresses mais \"addr:street\" sur "
-#~ "les éléments"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "{0} objet restauré"
-#~ msgstr[1] "{0} objets restaurés"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Les données copiées contiennent des objets incomplets. Au collage, les "
-#~ "objets incomplets sont retirés. Voulez-vous coller les données sans les "
-#~ "objets incomplets ?"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Télécharger les objets se rapportant à une des objets sélectionnés"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Le calque \"{0}\" a déjà un conflit pour l’objet <br>\"{1}\"</br>. "
-#~ "Ce conflit ne peut pas être ajouté.</html>"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "vers l’objet {0}"
-#~ msgstr[1] "vers les objets {0}"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Attention : le calque ''{0}'' n’existe plus. Impossible de retirer le "
-#~ "conflit de l’objet ''{1}''."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "Attention : le format URL de l’API est inattendue. La redirection vers la "
-#~ "page d’informations OSM ou d’historique de l’objet échouera probablement. "
-#~ "L’URL est : ''{0}''"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Fusionner les objets sélectionnés dans un autre calque"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Les objets suivants ne peuvent pas être copiées sur un objet "
-#~ "cible<br>parce qu’ils ont été supprimés du jeu de données cible :"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Sélectionner les objets envoyés par cet utilisateur"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Télécharger et afficher l’historique des objets sélectionnés"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr "Zoomer sur les objets du groupe de modifications"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "La fusion des objets supprimés a échoué"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Cette relation possède déjà un ou plusieurs membres se rapportant "
-#~ "à<br>l’objet ''{0}''<br>Voulez-vous vraiment un ajouter un autre membre à "
-#~ "la relation ?</html>"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Zoomer sur les objets correspondants dans le calque"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Le calque ''{0}'' possède un conflit sur l’objet<br>''{1}''."
-#~ "<br>Veuillez d’abord résoudre ce conflit puis réessayer.</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Sélectionner les membres de la relation se rapportant aux objets dans la "
-#~ "sélection"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Sélectionner les membres de la relation se rapportant à {0} objets dans "
-#~ "la sélection"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Sélectionner les objets correspondants aux membres de la relation"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "Supprimer les membres se rapportant à l’un des objets sélectionnés"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Plusieurs membres se rapportent au même objet"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Ajouter les objets sélectionnés devant le premier membre sélectionné"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr "Ajouter les objets sélectionnés après le dernier membre sélectionné"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr "Ajouter les objets sélectionnés devant le premier membre"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr "Ajouter les objets sélectionnés après le dernier membre"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Attention : l’objet \"{0}\" est déjà supprimée sur le serveur. Il sera "
-#~ "ignoré pour compléter l’envoi."
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Vous avez défini un rôle vide pour {0} objet."
-#~ msgstr[1] "Vous avez défini un rôle vide pour {0} objets."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Ceci est équivalent à supprimer les rôles de ces objets."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Le serveur a renvoyé une erreur 404, nouvelle tentative en utilisant des "
-#~ "requêtes individuelles pour chaque objet."
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Préparation des objets à envoyer..."
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>L’adresse Web<br>''{0}''<br>de ce calque WMS ne finit pas par un "
-#~ "''&'' ni par un ''?''.<br>La requête sera probablement invalide. Vous "
-#~ "devriez vérifier vos<br>préférences.<br>Voulez-vous récupérer des tuiles "
-#~ "WMS ?"
-
-#~ msgid "WMS URL"
-#~ msgstr "Adresse Web du service WMS"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Entrez une chaine de caractère comme filtre :"
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "''{0}'' n’existe pas."
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-#~ msgstr ""
-#~ "''{0}'' n’est pas lisible. Impossible de charger un moteur de script à "
-#~ "partir de ce fichier."
-
-#~ msgid "IO error"
-#~ msgstr "Erreur I/O"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "L’objet de type {0} ayant pour identifiant {1} a été marqué comme "
-#~ "supprimé mais il est manquant dans le jeu de données source"
-
-#~ msgid "Keep current list"
-#~ msgstr "Conserver la liste actuelle"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Profil d’élévation pour la trace '"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "Fusionner le contour d’une zone avec celui d’une autre zone"
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "Le chemin <strong>from</strong> <span class=\"object-name\">{0}</span> et "
-#~ "le chemin <strong>to</strong> <span class=\"object-name\">{1}</span> se "
-#~ "croisent au nœud <span class=\"object-name\">{2}</span>, mais <span class="
-#~ "\"object-name\">{2}</span> n’est pas un objet <strong>via</strong>.<br>Il "
-#~ "est recommandé de régler <span class=\"object-name\">{2}</span> en tant "
-#~ "qu’unique objet <strong>via</strong>."
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>Le script ne peut pas être exécuté car il n’y a aucun moteur de script "
-#~ "installé.</p><p>Consultez l’aide en ligne pour plus d’informations sur "
-#~ "comment installer un moteur de script avec JOSM.</p>"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Permet d’associer des photos aux traces d’un fichier GPX. La "
-#~ "correspondance est faite lorsque le champ ’name’, ’cmt’ ou ’desc’ d’un "
-#~ "point de passage correspond au nom de l’image."
-
-#~ msgid "Script execution has failed."
-#~ msgstr "L’exécution du script a échoué."
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM supporte actuellement les moteurs de script suivants :"
-
-#~ msgid "Version:"
-#~ msgstr "Version :"
-
-#~ msgid "JAR file"
-#~ msgstr "Fichier jar"
-
-#~ msgid "Select a jar file"
-#~ msgstr "Sélectionner un fichier jar"
-
-#~ msgid "JAR files"
-#~ msgstr "Fichier jar"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Impossible de créer une nouvelle erreur. Résultat : {0}"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr ""
-#~ "Vous avez sélectionné {0} éléments mais vous ne pouvez en modifier qu’un "
-#~ "seul à la fois !"
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "Ajouter un fichier jar fournissant un moteur de script"
-
-#~ msgid "No script engine"
-#~ msgstr "Aucun moteur de script"
-
-#~ msgid "Script engines"
-#~ msgstr "Moteurs de script"
-
-#~ msgid "Available script engines"
-#~ msgstr "Moteurs de script disponibles"
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "Configurer les moteurs de script et les scripts"
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr ""
-#~ "Le fichier jar ''{0}'' ne fournit pas de moteur de script. L’entrée "
-#~ "''{1}'' est manquante."
-
-#~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
-#~ msgstr ""
-#~ "L’ouverture du fichier ''{0}'' comme fichier jar a échoué. Impossible de "
-#~ "charger un moteur de script depuis ce fichier."
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr ""
-#~ "Entrer des fichiers jar supplémentaires fournissant des moteurs de script."
-
-#~ msgid "File not readable"
-#~ msgstr "Fichier illisible"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Migration des paramètres WMS/Carte glissante"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "Il y a {0} paramètres de la carte glissante inconnus"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Remplacer avec les paramètres de la carte glissante"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Paramètres de la carte glissante :"
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "L’exécution de la macro a échoué."
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Résoudre le conflit"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorer le conflit dans le futur"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "Le fichier de script ''{0}'' n’est pas lisible."
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "Le fichier de script ''{0}'' n’existe pas."
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Attention : aucune préférence ''{0}'' n’a été trouvée."
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Autoriser la modification des noms des points de passage."
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% de la trace GPS"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr ""
-#~ "Glisser/Déposer : faites glisser le segment de chemin et déposez-le sur "
-#~ "un segment de destination"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr ""
-#~ "Faites glisser le segment de chemin et déposez-le sur un segment de "
-#~ "destination"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "Déposer pour aligner sur le segment de destination"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "L’identifiant n’est pas valide. Impossible de télécharger l’objet."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Permet à l’utilisateur de créer différents jeux de couleurs et de "
-#~ "basculer entre eux. Changez les couleurs et créez un nouveau jeu. "
-#~ "Pratique pour basculer sur un fond blanc avec des couleurs adaptées à une "
-#~ "meilleure visibilité en plein soleil. Voir les Paramètres de la carte "
-#~ "dans les préférences."
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Modifier les attributs de 1 objet"
-
-#~ msgid "Launch file chooser"
-#~ msgstr "Ouvrir un sélecteur de fichiers"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Vous devez sélectionner au moins deux nœuds ou un nœud proche d’un autre "
-#~ "nœud."
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Afficher avec le zoom : {0}"
-
-#~ msgid "Run..."
-#~ msgstr "Exécuter"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "Entrez les coordonnées du nouveau nœud. <br/>Vous pouvez séparer la "
-#~ "longitude et la latitude avec un espace, une virgule ou un point virgule. "
-#~ "<br />Utilisez des nombres positifs ou les lettres N ou E pour indiquer "
-#~ "les points cardinaux Nord ou Est.<br/>Pour les points cardinaux Sud et "
-#~ "Ouest, vous pouvez utiliser soit des nombres négatifs ou les lettres S ou "
-#~ "W. <br/>Les valeurs pour les coordonnées doivent être données dans un des "
-#~ "trois formats suivants : <ul><li><i>degrés</i><tt>&deg;</tt></li> "
-#~ "<li><i>degrés</i><tt>&deg;</tt> <i>minutes</i><tt>&#39;</tt></"
-#~ "li><li><i>degrés</i><tt>&deg;</tt> <i>minutes</i><tt>&#39;</tt> "
-#~ "<i>secondes</i><tt>&quot</tt></li></ul>Les symboles <tt>&deg;</tt>, "
-#~ "<tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> sont "
-#~ "facultatifs.<br/><br/>Exemples : <ul><li>49.29918&deg; 19.24788&deg;</"
-#~ "li><li>N 49.29918 E 19.24788</li><li>W 49&deg;29.918&#39; S "
-#~ "19&deg;24.788&#39;</li><li>N 49&deg;29&#39;04&quot; E "
-#~ "19&deg;24&#39;43&quot;</li><li>49.29918 N, 19.24788 E</"
-#~ "li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</li><li>49 29 "
-#~ "51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Il ya des erreurs. Envoyer quand même ?"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Les résultats suivants sont issues de la validation automatique des "
-#~ "données. Essayez de les corriger mais attention à ne pas supprimer de "
-#~ "données valides. En cas de doute, ignorez-les.<br>\r\n"
-#~ "Vous pouvez retrouver ces résultats dans la fenêtre du validateur de "
-#~ "données."
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "Fusionne les contours de deux surfaces"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "Permet d'exécuter des scripts dans JOSM"
-
-#~ msgid "Analyzing"
-#~ msgstr "Analyse en cours"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Attention : l’adresse Web ''{0}'' ne se finit ni par '&', ni par '?'."
+#~ "Le greffon cadastre-fr utilise la touche F11 comme raccourci pour le "
+#~ "téléchargement\n"
+#~ "du cadastre mais celle-ci est actuellement affectée à l’affichage plein "
+#~ "écran.\n"
+#~ "Voulez-vous affecter la touche F11 au téléchargement du cadastre ?"
+
+#~ msgid "Global settings"
+#~ msgstr "Paramètres généraux"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 26529)
+++ applications/editors/josm/i18n/po/gl.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-19 17:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:47+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:42+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Axuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "O parametro \"downloadgps\" non acepta nomes de ficheiros ou URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -135,13 +136,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -161,7 +162,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -171,6 +172,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,5 +202,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -383,6 +384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -409,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -415,7 +416,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -423,5 +425,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -631,5 +633,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -881,5 +883,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1069,6 +1071,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1219,5 +1221,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1438,6 +1440,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2110,5 +2112,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2425,7 +2427,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Descargar data"
@@ -2682,7 +2684,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ignorando excepción porque a descarga foi cancelada. A excepción foi: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2813,10 +2814,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2980,5 +2981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3578,5 +3579,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3627,40 +3628,40 @@
 msgstr "Cambiados nodos de {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Borra \"{0}\" para o nodo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Borra \"{0}\" para a via \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Borra \"{0}\" para a relación \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Establecer {0} = {1} para o nodo \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Establecer {0} = {1} para a vía \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Establecer {0} = {1} para a relación \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Borrar \"{0}\" de {1} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3786,4 +3787,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Eliminar confirmación"
@@ -4102,9 +4104,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Atencion: Fallou ao iniciar as preferencias. Fallou ao restablecer o "
-"ficheiro de preferencias ao ficheiro por defecto :{0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4140,8 +4140,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Atención: número de versión de JOSM inesperado no ficheiro de revisión, o "
-"valor é \"{0}\""
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4248,10 +4246,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM espetaba atopar a primitiva [{0} {1}] no conxunto de datos pero non "
-"está ahi. Por favor reporte isto en http://josm.openstreetmap.de . Isto non "
-"é un erro crítico, deberia ser seguro continuar no teu choio."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4355,5 +4350,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4372,8 +4367,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4516,52 +4511,64 @@
 msgstr "WGS84 Geographic"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Atención: Fallou ao abrir a secuencia de entrada para o recurso \"/data/"
-"{0}\". Non se pode cargar NTF <-> malla RGF93"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zonas (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} to {2} grados)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zona"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zona (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4586,81 +4593,101 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zona"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Suíza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Latvia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zona"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Norte"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Sur"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Hemisferio"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Desprazamento 3.000.000m leste"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Francia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM sistema xeodésico"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4881,45 +4908,45 @@
 msgstr "Comproba se os multipolígonos son válidos"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "O multipolígono non está fechado"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5188,5 +5215,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5211,5 +5238,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5220,5 +5247,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5625,5 +5652,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5693,5 +5720,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "Carretera"
@@ -5699,5 +5726,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5705,10 +5732,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "Vía acuática"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "uso da terra"
@@ -5718,5 +5745,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5730,5 +5757,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5741,5 +5768,5 @@
 msgstr "transporte público"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6105,5 +6132,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6214,4 +6241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6319,5 +6347,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6362,11 +6390,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Alternativamente pode introducir unha <strong> dirección de tesela</"
-"strong> para unha tesela no formato <i> nivel_de_zoom/x/y</i>, por exemplo "
-"<i>15/256/223</i>.As direccións de teselas no formato<i>zoom,x,y</i> ou "
-"<i>zoom;x;i</i>tamén són válidas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6660,9 +6684,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista de elementos misturados. Eles reemplazarán os meus elementos cando a "
-"decisión de mistura sexa aplicada."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6910,10 +6932,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Mantener as miñas coordenadas"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Mantener as suas coordenadas"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6971,6 +6993,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6992,6 +7014,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7407,5 +7429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7653,5 +7675,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7866,7 +7888,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "descoñecido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8130,5 +8182,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8148,5 +8200,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8163,5 +8215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Descargar membros incompletos das relacións escollidas"
@@ -8169,5 +8221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Descargar membros incompletos"
@@ -8210,5 +8262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8216,5 +8268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8414,5 +8466,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8516,5 +8568,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Usuario"
@@ -9508,5 +9559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9688,5 +9739,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9840,4 +9891,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Só conxuntos de cambios que me pertencen a min mismo"
@@ -9850,4 +9902,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Só conxuntos de cambios que lle pertencen ao seguinte nome de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10130,9 +10188,9 @@
 msgstr "Esta petición de conxunto de cambios é inválida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10141,13 +10199,13 @@
 msgstr[1] "Modificaranse {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Un valor vacío borra o atributo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10160,18 +10218,19 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Cambiar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10180,5 +10239,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10188,5 +10247,5 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10195,28 +10254,32 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor selecciona os obxectos dos que queres cambiar as propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Propiedades dos obxectos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10225,62 +10288,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Posición"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Escoller relación na selección principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10344,10 +10407,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Aviso: ignorando excepción porque o traballo foi cancelado. Excepción: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10369,7 +10433,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Descargando {0} relación incompleta de {1} relación pai"
-msgstr[1] "Descargando {0} relacións fillas incompletas de {1} relacións pais"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10709,10 +10773,4 @@
 msgstr "Houbo {0} conflictos durante a importación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Aviso: Ignorando excepción porque o traballo está cancelado. Excepción: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10753,12 +10811,4 @@
 msgid "Load relation"
 msgstr "Cargar relacióm"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Aviso: ignorando excepción porque o traballlo foi cancelado. A excepción "
-"foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11039,37 +11089,4 @@
 msgstr "Tipo"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "descoñecido"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11186,20 +11203,20 @@
 msgstr "Coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Histórico do nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Histórico da vía {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Histórico da relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Recargar o historial dende o servidor"
@@ -11300,6 +11317,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Conxunto de cambios"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11847,8 +11864,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12259,4 +12276,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12282,11 +12300,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12363,38 +12374,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Personalizar Cor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Predeterminado"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Escolle unha cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Descrición: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12405,9 +12416,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12415,26 +12426,26 @@
 msgstr "Descrición"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Lonxitude"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Lonxitude: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12443,8 +12454,8 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12453,12 +12464,12 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "punto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12467,10 +12478,10 @@
 msgstr[1] "{0} trazados, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12478,78 +12489,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Descargar de OSM ó longo desta pista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "só via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "só puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "pista e puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12560,11 +12571,11 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12574,6 +12585,6 @@
 "posteriores ó fin foron omitidos ou movidos ó inicio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12583,27 +12594,27 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Marca dos puntos con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de trazado con nome de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12613,29 +12624,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Ficheiros Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcas de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importar imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12739,5 +12750,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12747,57 +12758,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Ampliación automática"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13324,10 +13343,10 @@
 msgstr "imaxes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "marca gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13335,5 +13354,5 @@
 msgstr[1] "marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13342,22 +13361,22 @@
 msgstr[1] "{0} componse de {1} marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 "Non existen marcas de audio en esta capa para, a partir das cales, compensar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Cambiar o estado visible do texto e iconas da marca."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Sincronizar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13365,5 +13384,5 @@
 "Debes pausar o audio no momento que escoites a túa entrada de sincronización."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13371,14 +13390,14 @@
 msgstr "Audio sincronizado no punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Non se pode sincronizar nunha capa en reproducción."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13402,13 +13421,13 @@
 msgstr "Non se puido crear unha nova marca de audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Houbo un erro tratando de amosar a URL desta marca."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(a URL era: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Erro amosando a URL"
@@ -14370,63 +14389,63 @@
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Debuxar Frechas de Dirección"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Só no extremo da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Debuxar os números de orde dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Debuxar os límites dos datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Debuxar nodos virtuais no modo de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Debuxar as capas inactivas en outra cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos de mapa suaves (filtro antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Debuxar consellos de dirección para segmentos de vía."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14435,10 +14454,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14447,9 +14466,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Debuxar as capas de datos inactivas nunha cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14457,15 +14476,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Datos OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Auto"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Nome"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Desc(ripcion)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Ningún"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Usar configuración global."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14476,47 +14531,39 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Ficheiros locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Ningún"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Forzar liñas se non se importou ningún segmento."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Debuxar puntos GPS grandes."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Debuxa un novo círculo a partir de un valor HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermello = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -14524,5 +14571,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14546,5 +14593,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14587,5 +14634,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14599,38 +14646,18 @@
 msgstr "Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Crear marcadores cando se leen GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Debuxo rápido (peor resultado)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Auto"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Nome"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Desc(ripcion)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Ambos"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14641,10 +14668,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Debuxar liñas entre puntos GPS en bruto"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14654,10 +14681,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Lonxitude máxima para os ficheiros locais (metros)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14666,10 +14693,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Lonxitude máxima (metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14678,10 +14705,10 @@
 "de liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14690,5 +14717,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14698,14 +14725,14 @@
 "da anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima (pixeles)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14715,13 +14742,13 @@
 "personalizados no Xestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14729,28 +14756,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Coloreado de Trazados e Puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15419,5 +15464,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15509,5 +15554,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Restablecer"
@@ -15784,6 +15829,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Sempre actualizar sen preguntar"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16169,5 +16214,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16196,9 +16241,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16478,6 +16523,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16800,5 +16845,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -17023,5 +17068,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17433,4 +17478,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Gardar usuario e contrasinal (sen encriptar)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18264,4 +18314,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18382,4 +18434,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18949,6 +19015,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Permítelle filtrar pistas GPS innecesarias"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
@@ -35291,4 +35357,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35305,6 +35372,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35323,15 +35390,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "nombre abreviado da rúa"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "Nodo etiquetado como vía unidireccional"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "Nodo etiquetado como ponte"
@@ -35342,12 +35409,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "Nodo con etiqueta de vía errónea"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Vía sen clasificar sen nombre"
@@ -35356,16 +35423,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "via sen referencia"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "Tipo de via temporal"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "Nome de clave mal escrito"
@@ -35375,10 +35442,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "vía ciclista con etiqueta bicicleta"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "vía peatonal con etiqueta a pé"
@@ -35387,10 +35454,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "carril bici etiquetado como vía ciclable"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Barreira usada nunha vía"
@@ -35399,35 +35466,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "velocidad máxima usada nunha rúa peatonal"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "etiqueta capa co signo +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "O nome da rua contén ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relación sin tipo"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurante sen nome"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "combinación de etiquetas inusual"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35532,117 +35608,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Mapas NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Mapas (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Xapón (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Xapón (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Xapón (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Xapón (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italia"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italia"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Francia)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35887,6 +35973,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Subida de datos cancelada"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35988,9 +36074,9 @@
 msgstr "(Sen datos de elevación)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36008,23 +36094,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36032,26 +36148,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Información do complemento"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36059,5 +36203,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36168,9 +36312,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "elementos"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "sen elementos"
@@ -36269,17 +36413,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Propriedades da Capa"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Importar Imaxe"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36917,28 +37078,35 @@
 msgstr "Escoller común"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM esta parada para que o cambio surxa efecto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37058,9 +37226,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Reemplazar o fondo blanco orixinal polo color de fondo definido nas "
-"preferencias de JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37951,5 +38117,5 @@
 msgstr "Engadir capa EGPX"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37959,17 +38125,17 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Debuxar liñas entre puntos para esta capa."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Non debuxar liñas entre puntos para esta capa."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Escoller as opcións de liña do debuxo"
@@ -38121,5 +38287,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38127,10 +38293,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38139,5 +38305,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38146,6 +38312,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38154,9 +38320,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38315,71 +38481,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38387,32 +38561,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38447,6 +38615,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38577,30 +38745,43 @@
 msgstr "Importando..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39286,5 +39467,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39301,5 +39482,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40034,17 +40215,17 @@
 msgstr "Nova capa de imaxe do portapapéis"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Nova capa de imaxe de ficheiro..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Non se puido atopar o obxecto mapa."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40058,36 +40239,32 @@
 msgstr "Os datos do portapapéis non son os de unha imaxe"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "Atopouse un ficheiro de calibración asociado á imaxe:"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40709,5 +40886,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41678,4 +41855,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41897,6 +42091,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42143,6 +42337,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Abrir un editor para a restrición de xiro escollida"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -42721,5 +42915,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43106,2373 +43300,110 @@
 msgstr ""
 
-#~ msgid "Do not show again"
-#~ msgstr "Non amosar de novo"
+#~ msgid "Change values?"
+#~ msgstr "Cambiar valores?"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Subida de datos cancelada"
 
 #~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Ocurriu unha excepción inesperada\n"
-#~ "\n"
-#~ "Isto é sempre un erro de código. Se estas a usar a última\n"
-#~ "versión de JOSM, por favor considera ser tan amable  de abrir un informe "
-#~ "de erro."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Asegúrate de incluir a seguinte información:"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Preparando datos..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Erro durante a análise."
+#~ "Reemplazar o fondo blanco orixinal polo color de fondo definido nas "
+#~ "preferencias de JOSM."
 
 #~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Non se puido conectar co servidor osm. Por favor revisa a túa conexión a "
-#~ "internet."
+#~ "Ignorando excepción porque a descarga foi cancelada. A excepción foi: {0}"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "O servidor devolveu un erro interno. Intentao cunha área máis reducida ou "
-#~ "logo de esperar un tempo."
-
-#~ msgid "Unknown version"
-#~ msgstr "Versión descoñecida"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Obxecto ilegal con id=0"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Falta o atributo obrigatorio \"{0}\"."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
+#~ "Lista de elementos misturados. Eles reemplazarán os meus elementos cando "
+#~ "a decisión de mistura sexa aplicada."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Mantener as suas coordenadas"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Mantener as miñas coordenadas"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "combinación de etiquetas inusual"
+
+#~ msgid ""
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Erro de análise: estrutura de documento non válida para documento gpx"
-
-#~ msgid "Commit comment"
-#~ msgstr "Asigna comentario"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Subindo..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transferencia abortada debido a un erro (espera de 5 segundos):"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Contrasinal ou nome de usuario incorrectos."
-
-#~ msgid "Enter Password"
-#~ msgstr "Introduce Contrasinal"
-
-#~ msgid "Login"
-#~ msgstr "Inicio de sesión"
-
-#~ msgid "Aborting..."
-#~ msgstr "Abortando..."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
+#~ "<html>Alternativamente pode introducir unha <strong> dirección de tesela</"
+#~ "strong> para unha tesela no formato <i> nivel_de_zoom/x/y</i>, por "
+#~ "exemplo <i>15/256/223</i>.As direccións de teselas no formato<i>zoom,x,y</"
+#~ "i> ou <i>zoom;x;i</i>tamén són válidas.</html>"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "A proxección non puido ser lida dende as preferencias. Usando EPSG:4326"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Cambios non gardados"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Hai cambios sen gardar. Descartar os cambios e continuar?"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Gardar e Sair"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Por favor introduce unha cadea de busca"
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid "near"
-#~ msgstr "cerca"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
+#~ "Atención: Fallou ao abrir a secuencia de entrada para o recurso \"/data/"
+#~ "{0}\". Non se pode cargar NTF <-> malla RGF93"
+
+#~ msgid "Changeset"
+#~ msgstr "Conxunto de cambios"
+
+#~ msgid "Both"
+#~ msgstr "Ambos"
 
 #~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato "
-#~ "mantendo o botón dereito pulsado. Seleccionar: Facer click."
-
-#~ msgid "zoom level"
-#~ msgstr "nivel de zoom"
-
-#~ msgid "x from"
-#~ msgstr "x dende"
-
-#~ msgid "to"
-#~ msgstr "ata"
-
-#~ msgid "y from"
-#~ msgstr "y dende"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Fontes de Datos e Tipos"
-
-#~ msgid "Download Area"
-#~ msgstr "Área de Descarga"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ "JOSM espetaba atopar a primitiva [{0} {1}] no conxunto de datos pero non "
+#~ "está ahi. Por favor reporte isto en http://josm.openstreetmap.de . Isto "
+#~ "non é un erro crítico, deberia ser seguro continuar no teu choio."
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contactando co servidor OSM..."
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Un valor vacío borra a clave."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Editar Propiedades"
-
-#~ msgid "Create new relation"
-#~ msgstr "Crear nova relación"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Editar nova relación"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Editar relación #{0}"
-
-#~ msgid "Occupied By"
-#~ msgstr "Ocupado por"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etiquetas (un valor vacío borra a etiqueta)"
-
-#~ msgid "Move Up"
-#~ msgstr "Mover cara arriba"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Engadir todos os obxectos seleccionados actualmente como membros"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eliminar Seleccionados"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Eliminar da relación todos os obxectos seleccionados actualmente"
-
-#~ msgid "Move Down"
-#~ msgstr "Mover cara abaixo"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Eliminar o membro da fila actual desta relación"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Membros: {0}"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor de Relación: {0}"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Erro analizando a resposta do servidor."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Non se pode conectar co servidor."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Fai click en Recargar para actualizar a lista"
+#~ "Atención: número de versión de JOSM inesperado no ficheiro de revisión, o "
+#~ "valor é \"{0}\""
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Revertir o estado de todos os obxectos seleccionados actualmenete á "
-#~ "versión seleccionada na lista do historial."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ainda sen implementar."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autores: {0}"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Borrar a capa seleccionada."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Existen cambios sen gardar. Borrar a capa igualmente?"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Borrar Capa"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Desexas realmente borrar a capa completa?"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Amosar/Ocultar Texto/Iconas"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Combinar a capa inmediatamente inferior coa capa seleccionada."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Capas: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Actualizar a lista de seleccion."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Pila de Comandos: {0}"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punto"
-#~ msgstr[1] "puntos"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punto"
-#~ msgstr[1] "{0} puntos"
-
-#~ msgid "Timespan: "
-#~ msgstr "Rango de tempo: "
-
-#~ msgid "Length: "
-#~ msgstr "Lonxitude: "
-
-#~ msgid "Images for {0}"
-#~ msgstr "Imaxes para {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Ler GPX..."
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Inicio GPS: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Fin GPS: {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "Diferencia de zona horaria: "
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imaxe"
-#~ msgstr[1] "imaxes"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} dentro da traza."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sincronizar reloxo"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Zona horaria da unidade GPS (differencia coa foto)"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Sincronizar hora coa da unidade GPS"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "A hora introducida non puido ser analizada."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} borrados.)"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Non se puideron ler os marcadores."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Non se puido escribir o marcador."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "A URL base do servidor OSM (REST API)"
+#~ "Atencion: Fallou ao iniciar as preferencias. Fallou ao restablecer o "
+#~ "ficheiro de preferencias ao ficheiro por defecto :{0}"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Sempre actualizar sen preguntar"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "Atopouse un ficheiro de calibración asociado á imaxe:"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Permítelle filtrar pistas GPS innecesarias"
 
 #~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
-#~ "almacenar ningunha contrasinal."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL Base do Servidor"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Nome de usuario OSM (correo-e)"
-
-#~ msgid "OSM password"
-#~ msgstr "Contrasinal OSM"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Fonte de etiquetado preestablecido"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Engadir unha nova fonte de etiquetado preestablecido á lista."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Fontes de etiquetado preestablecido."
-
-#~ msgid "Download List"
-#~ msgstr "Descargar lista"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Configurar sitios..."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Engadir ou site-josm.xml ou as páxinas Wiki."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Habilitar servidor proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anónimo"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Preferencias do proxy"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Porto do servidor proxy"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Nome de usuario do servidor proxy"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Contrasinal do servidor proxy"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Crear marcas non auditivas ó ler GPX."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
+#~ "Aviso: ignorando excepción porque o traballo foi cancelado. Excepción: {0}"
+
+#~ msgid ""
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Só consellos acerca de direccións interesantes (p.e. coa etiqueta de "
-#~ "dirección única)."
+#~ "Aviso: Ignorando excepción porque o traballo está cancelado. Excepción: "
+#~ "{0}"
 
 #~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Lonxitude máxima (en metros) para debuxar liñas. Poñer a '-1' para "
-#~ "debuxar todas as liñas."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Non debuxar frechas se non teñen, como mínimo, esta distancia de "
-#~ "separación da anterior."
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Ademais, os atallos actívanse cando as accións son asignadas a unha "
-#~ "entrada de menú dun botón por primeira vez. Polo que os cambios poida que "
-#~ "se apliquen incluso sen reiniciar --- pero tamén sen control de "
-#~ "colisións. Esta é outra razón para <b>reiniciar</b> JOSM logo de realizar "
-#~ "algún cambio aqui.</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Por favor, ten en conta que as teclas dos atallos son asignadas ás "
-#~ "accións cando JOSM se inicia. Polo que é preciso <b>reiniciar</b> JOSM "
-#~ "para aplicar os cambios.</p>"
-
-#~ msgid "layer not in list."
-#~ msgstr "a capa non está na lista."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Activando extensións actualizadas"
-
-#~ msgid "Set the language."
-#~ msgstr "Establecer o idioma."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Os parámetros son lidos na orde que son especificados polo que, "
-#~ "asegúrate\n"
-#~ "que cargas algo de información antes de --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr ""
-#~ "En lugar de --download=<límites> debes especificar osm://<límites>\n"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Erro durante a análise"
-
-#~ msgid "their version:"
-#~ msgstr "a súa version:"
-
-#~ msgid "my version:"
-#~ msgstr "a miña versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión final:"
-
-#~ msgid "Add Selected"
-#~ msgstr "Engadir Seleccionados"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Por favor, introduce un nome para o lugar."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Por favor, primeiro introduce as coordenadas desexadas."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecciona primeiro un marcador."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Non hai hora para o punto {0} x {1}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "delta actual: {0}s"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} componse de {1} trazado"
-#~ msgstr[1] "{0} componse de {1} trazados"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "un trazado con {0} punto"
-#~ msgstr[1] "un trazado con {0} puntos"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Servidor proxy"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Gracias pola túa comprensión</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>O pseudo modificador 'desactivado' desactivará o atallo cando o atope."
-#~ "</p>"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Grupo de axustes preestablecidos \"{0}\""
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr ""
-#~ "Exception de Punteiro Nulo, posiblemente algunhas etiquetas perdidas."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Atopouse un elemento <nd> no que non é unha vía."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ten referencia cero"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Atopouse un elemento <member> no que non é unha relación."
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} restantes. Subindo {4}: {5} (id: {6})"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "ID de nodo mal formada"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Houbo problemas cos seguintes engadidos:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Actualizar Engadidos"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "O servidor non soporta coleccións de cambios"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "Engadido actualizado con éxito. Por favor reinicia JOSM."
-#~ msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "O engadido {0} semella estar estropeado ou non puido ser descargado "
-#~ "automáticamente."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Advertencia - foi solicitada a descarga do engadido {0}. Este engadido xa "
-#~ "non é necesario."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Engadido non atopado: {0}"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "O engadido {0} foi requerida polo engadido {1} pero non se atopou."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "O engadido require a actualización de JOSM: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Podes cambiar o número de días tras os cales aparecerá esta "
-#~ "advertencia<br>establecendoos coa opción de configuración 'pluginmanager."
-#~ "warntime'.)"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Non se puido descargar o engadido: {0} de {1}"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "A activacción dos engadidos actualizados fallou. Comproba se JOSM ten "
-#~ "permisos para sobrescribir os existentes."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "O engadido non puido ser eliminado. Por favor, comentalle o problema á "
-#~ "xente que che propocionou JOSM."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Descargada información de engadidos de {0} sitio"
-#~ msgstr[1] "Descargada información de engadidos de {0} sitios"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Non se atopou información de engadidos."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Descargar engadidos perdidos"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Descargar os seguintes engadidos?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Descargar Engadidos"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Todos os engadidos instalados estan actualizados."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versión {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Actualiza os seguintes engadidos:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Erro borrando ficheiro de engadido: {0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Erro lendo o ficheiro de informaclión de engadido: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "O engadido xa existe"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Borrar e Descargar"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "O arquivo de engadidos xa esta dispoñible. Queres descargargar a versión "
-#~ "actual borrando o arquivo existente?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "File could not be found."
-#~ msgstr "O ficheiro non puido ser atopado"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "O ficheiro de preferencias contiña erros. Creando copia de seguridade do "
-#~ "antigo a {0}"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de ficheiro descoñecida."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Non se puido renomear o ficheiro \"{0}\""
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr ""
-#~ "Produciuse un erro mentras se restauraba o ficheiro de copia de "
-#~ "seguridade."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Non se puido facer copia de seguridade do ficheiro."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
-
-#~ msgid "File not found"
-#~ msgstr "Ficheiro non atopado"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Conservar ficheiros de copia de seguridade"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Un dos ficheiros seleccionados era nulo !!!"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "As fontes (URL ou nome de ficheiro) dos ficheiros de definición de "
-#~ "etiquetado preestablecido. Ver http://josm.openstreetmap.de/wiki/"
-#~ "TaggingPresets para obter axuda."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ADVERTENCIA: O contrasinal é almacenado en texto plano no ficheiroo "
-#~ "de preferencias.<br>O contrasinal é transferido ó servidor en texto "
-#~ "plano, codificado na URL.<br><b>Non uses un contrasinal valioso.</b></"
-#~ "html>"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Ficheiro de caché da Zona Lambert 4 (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Ficheiro de caché da Zona Lambert 1 (.1)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Ficheiro de caché da Zona Lambert 2 (.2)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Ficheiro de caché da Zona Lambert 3 (.3)"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importar ficheiro TCX como trazado GPS"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importar Ficheiro TCX..."
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Activar os valores predeterminados incorporadas"
-
-#~ msgid "Default Values"
-#~ msgstr "Valores Predeterminados"
-
-#~ msgid "Copy Default"
-#~ msgstr "Copiar Predeterminado"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "URL WMS (Predeterminada)"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Consello: Algúns cambios veñen de subir novos datos ó servidor."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Usar grados decimais."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Introducir as coordenadas para o novo nodo."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Valores negativos indican que é o hemisferio Oeste/Sur."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Algúns dos nodos están (case) na liña"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Combinar de todas formas"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Todas as vías están vacías"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Eses nodos non estan en un círculo"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Por favor, selecciona exactamente tres nodos, ou unha vía con tres nodos "
-#~ "exactamente."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
-
-#~ msgid "gps track description"
-#~ msgstr "descripción de trazado gps"
-
-#~ msgid "Email"
-#~ msgstr "Correo Electrónico"
-
-#~ msgid "History of Element"
-#~ msgstr "Historial do Elmento"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erro durante a carga da páxina {0}"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Amosar a información do historial acerca das vías ou nodos OSM."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Abrir nun navegador"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Axuda en liña de JOSM"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Por favor, selecciona polo menos un nodo, via ou relación. Só os "
-#~ "elementos xa subidos teñen historial."
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda "
-#~ "en uso."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Acoplar de todas formas"
-
-#~ msgid "Create a new map."
-#~ msgstr "Crear un novo mapa."
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Sentencias mal formadas: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Fallo de importación NMEA!"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Sentencias descoñecidas: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Coordenada cero: "
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "A selección debe estar formada só por vías."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro "
-#~ "nodos."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Estas a usar a proxección EPSG:4326 que pode conducir<br>a "
-#~ "resultados non desexados cando se realizan aliñamentos.<br>Cambia a túa "
-#~ "proxección para desfacerte desta advertencia.<br>Queres continuar?"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "So se permiten dous nodos"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Por favor, selecciona vías con ángulos case rectos para ortogonalizar."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Só hai un nodo seleccionado"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Abrir unha páxina de preferencias para a configuración global."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Ocurriu un erro mentres se gardaba."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Ningún dos nodos desta vía están pegados a outra cousa."
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Actualiza a capa de datos actual dende o servidor (descarga de novo os "
-#~ "datos)"
-
-#~ msgid "Update Data"
-#~ msgstr "Actualizar Datos"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Non se atoparon datos para actualizar. Abriches ou descargaches xa unha "
-#~ "capa de datos?"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Esta acción requerirá {0} peticións de descarga individuais. Queres "
-#~ "continuar?"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Subir estes cambios?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "SIbir todos os cambios ó servidor OSM."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Subir a OSM..."
-
-#~ msgid "Uploading data"
-#~ msgstr "Subindo datos"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Avance máis rápido"
-
-#~ msgid "Jump back."
-#~ msgstr "Saltar cara atrais."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Marca Anterior"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Reproducir a marca anterior."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Avance máis lento"
-
-#~ msgid "Play next marker."
-#~ msgstr "Reproducir a seguinte marca."
-
-#~ msgid "Next Marker"
-#~ msgstr "Marca Seguinte"
-
-#~ msgid "Jump forward"
-#~ msgstr "Saltar cara adiante"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
-
-#~ msgid "No data imported."
-#~ msgstr "Non se importaron datos."
-
-#~ msgid "Data Layer"
-#~ msgstr "Capa de datos"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Erros durante a descarga"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Facer click para borrar. Maiúsculas: borrar segmento de vía. Alt: Non "
-#~ "borrar nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos "
-#~ "aludidos."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Arrastrar un segmento de vía para crear un rectángulo."
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl "
-#~ "para cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar "
-#~ "selección"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Baker Street</b> - 'Baker' e 'Street' en calquer clave ou nome."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Baker Street\"</b> - 'Baker Street' en calquera clave ou nome."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' en calquer posición do nome."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - que non conteña 'Bak' no nome."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - obxecto coa ID indicada"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - obxectro có número de nodos indicado"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr "Usar <b>\"</b> para escapar operadores (p.e. se a clave conten : )"
-
-#~ msgid "Load Selection"
-#~ msgstr "Cargar Selección"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contacto {0}..."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Non se puido ler dende a URL: \"{0}\""
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Faltan argumentos para OR."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Esperabase parentese de peche."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Faltan argumentos para NOT."
-
-#~ msgid "Downloading..."
-#~ msgstr "Descargando..."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. "
-#~ "Por favor, informa disto como un erro."
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Establecer {0}={1} para {2} \"{3}\""
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Eliminar \"{0}\" para {1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Eliminar \"{0}\" para {1} \"{2}\""
-
-#~ msgid "Change"
-#~ msgstr "Cambiar"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Erro de análise na URL: \"{0}\""
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Estás a punto de borrar nodos que se atopan fora da área que descargaches."
-#~ "<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
-#~ "estar usandoos.<br>Queres borralos realmente?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "A selección \"{0}\" é usada pola relación \"{1}\" co papel {2}.\n"
-#~ "Borrar da relación?"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Establecer {0}={1} para {2} {3}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Borrar {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Borrar {1} {0}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "A selección \"{0}\" é usada pola relación \"{1}\".\n"
-#~ "Borrar da relación?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relación contradictoria"
-
-#~ msgid "Split way segment"
-#~ msgstr "Separar segmento de vía"
-
-#~ msgid "Rotate"
-#~ msgstr "Xirar"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Non aplicar cambios"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Non se pode abrir o directorio de preferencias: {0}"
-
-#~ msgid "position"
-#~ msgstr "posición"
-
-#~ msgid "different"
-#~ msgstr "diferente"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "true"
-#~ msgstr "verdadeiro"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grados Minutos Segundos"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "O"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Erro: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Advertencia: {0}"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "a vía multipoligonal \"{0}\" non está pechada."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Membro \"{0}\" borrado na relación."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "A vía de estilo de área non está pechada."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Membro vacío na relación."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Vía \"{0}\" con menos de dous puntos."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Non se atoparon vías \"ata\"."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Atopadas máis de unha vía \"ata\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Non se atoparon vias \"desde\"."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Papel \"{0}\" descoñecido."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Tipo de membro descoñecido para \"{0}\"."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Atopadas máis de unha vía \"desde\"."
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Erros de suma de verificación: "
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Non se poden ler resultados de busca de lugar dende o servidor"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Descargar todas as vías e nodos incompletos na relación"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'"
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Intersección entre as vías ''{0}'' e ''{1}''."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "A vía interior ''{0}'' está fóra."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Non se atopou o estilo para a restrición {0}"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Zona Lambert (Franza)"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Cambiar a vista de pantalla completa"
-
-#~ msgid "Full Screen"
-#~ msgstr "Pantalla completa"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Acepta as versións de protocolo 0.5 e 0.6, mentres que o servidor di que "
-#~ "acepta {0} a {1}."
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr ""
-#~ "Establecida a comunicación con {0} usando o protocolo da versión {1}"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Non se pode ler valor numérico da resposta"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Falta o número de versión dos datos do OSM"
-
-#~ msgid "Not initialized"
-#~ msgstr "Sen inicializar"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "A subida de datos fallou por causa descoñecida"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Versión descoñecida: {0}"
-
-#~ msgid "Public"
-#~ msgstr "Público"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Abrir imaxes con AgPifoJ..."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF="
-#~ "\"{1}\">galego</A>."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Comprobando se o nodo {0} falta ..."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Si, desfacer o borrado de eles tamén"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Non, cancelar a operación"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Hai {0} nodos adicionais usados pola vía {1}<br>que están borrados "
-#~ "no servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Desfacer o borrado de nodos adicionais?"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Desfacendo borrado de vía..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Desfacendo o borrado da relación.."
-
-#~ msgid "Keep mine"
-#~ msgstr "Conservar a miña"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Comprobando se a primitiva {0} falta ..."
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Desfacer o borrado de primitivas dependentes?"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "valor retornado non esperado. Obtívose {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitiva borrada no servidor"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>A primitiva OSM coa id <strong>{0}</strong> foi borrada<br>no "
-#~ "servidor por outro mapeador.<br><br>Fai click en <strong>{1}</strong> "
-#~ "para conservar a túa primitiva e ignorar o estado de borrado.<br>Á túa "
-#~ "primitiva seralle asignado un novo id.<br>Fai click en <strong>{2}</"
-#~ "strong> para aceptar o estado do servidor e borrar a túa primitiva."
-#~ "<br>Fai click en <strong>{3}</strong> para cancelar.<br>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Borrar a miña"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Fallou ao actualizar as primitivas seleccionadas."
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Hai <strong>{0}</strong> primitivas <br>seleccionadas para "
-#~ "actualización individual. Por favor, reduza a selección<br>a un máximo de "
-#~ "{1} primitivas.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Selección demasiado grande"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Non hai primitivas seleccionadas para actualizar."
-
-#~ msgid "Update Selection"
-#~ msgstr "Actualizar Selección"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Non se puido atopar a primitiva coa id {0} no paquete de datos actual"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitiva desaparecida"
-
-#~ msgid "Update failed"
-#~ msgstr "Actualización fallida"
-
-#~ msgid "Uploading"
-#~ msgstr "Actualizando"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Actualizando primitiva"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Sincronizar só {0} {1}"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado "
-#~ "\"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>A subida <strong>fallou</strong> porque a primitiva que intentou "
-#~ "borrar<br>no servidor xa está borrada.<br><br>A mensaxe de erro é:<br>{0}"
-#~ "</html>"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Detectado un conflito"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - a clave 'type' co valor exacto 'route'"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Primitivas borradas ou movidas"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Fallo ao iniciar comunicación co servidor OSM {0}.\n"
-#~ "Comproba o URL do servidor nas preferencias e a túa conexión a internet."
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "A primitiva xa foi borrada"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Ocurriron os seguintes erros durante a descarga masiva:"
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - a clave 'type' con calquer valor. Proba tamén <b>*=value</"
-#~ "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parámetros incorrecto para o operador nodes."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Valor incorrecto do operador nodes: {0}. O operador nodes espera un "
-#~ "número de nodos ou un rango, por exemplo nodes:10-20"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo "
-#~ "de 2. Os actuais son {1}"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Purgando 1 primitiva"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Erro durante a comunicación co servidor."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Valor incorrecto do operador id: {0}. Espérase un número."
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Desfacer o borrado de {0} primitivas"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Resolver {0} conflitos de etiquetas en {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Resolver conflitos na lista de nodos da vía {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Resolver conflitos de versión para {0} {1}"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Introducir valores para todos os conflitos."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Hai conflitos sen resolver. Debes resolver estes antes."
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Resolver Conflitos"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Solucionar {0} conflitos en {1} obxectos"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Poida que notes que a lista de selección de teclas da páxina seguinte "
-#~ "contén todas as teclas que existen en todos os tipos de teclado que "
-#~ "coñece JAVA, non só aquelas que contén o teu teclado. Por favor, usa so "
-#~ "aqueles valores que corresponden cunha tecla real do teu teclado. Polo "
-#~ "que, se o teu teclado non ten a tecla \"Copy\" (os teclados dos PC non a "
-#~ "teñen, pero os de SUN si), non a uses. Ademais aparecerán teclas que "
-#~ "correspondan cun atallo no teu teclado (p.e. ':'/Dous puntos). Por favor, "
-#~ "tampouco as uses, usa no seu lugar a tecla base (';'/Punto e coma nos "
-#~ "teclados norteamericanos, '.'/Punto nos teclados españois,...). Non "
-#~ "facelo así pode causar conflitos dado que JOSM non ten forma de saber que "
-#~ "'Ctrl+Maiús+.' e 'Ctrl+:' son realmente a mesma cousa nun teclado "
-#~ "español...</p>"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Houbo conflitos durante a importación."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Combinando conflitos"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} obxecto ten conflitos:"
-#~ msgstr[1] "{0} obxectos teñen conflitos:"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflitos: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Solucionar Conflito"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver Conflitos"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>A última páxina lista as teclas de modificadores que JOSM asifnará "
-#~ "automáticamente ós atallos. Para cada un dos catro tipos de atallos hai "
-#~ "tres alternativas. JOSM probará esas alternativas na orde da lista cando "
-#~ "se presente un conflito. Se todas as alternativas resultan en atallos xa "
-#~ "usados, asignará no seu lugar un atallo escollido aleatoriamente.</p>"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "non se atopou a última versión. O historial está valeiro."
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Non hai unha primitiva coa versión {0} en este historial"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "non se atopou unha versión anterior. O historial está valeiro."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Ningún nodo o vía \"vía\" atopados."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Atopouse máis de un \"vía\"."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id "
-#~ "\"{1}\""
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr ""
-#~ "Non se atopou unha primitiva gardada en historial coa id {0} en este "
-#~ "conxunto de datos"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de "
-#~ "datos"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "o parámetro \"{0}\" debe non ser nulo"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\""
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF="
-#~ "\"{1}\">galego</A>."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "o parámetro \"{0}\" debe non ser nulo"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "valor retornado non esperado. Obtívose {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Non hai unha primitiva coa versión {0} en este historial"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "non se atopou unha versión anterior. O historial está valeiro."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "non se atopou a última versión. O historial está valeiro."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id "
-#~ "\"{1}\""
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Non se puido ler \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Non se puido conectar co servidor osm. Por favor revisa a túa conexión a "
-#~ "internet."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "AVISO:formato inesperado da API base URL. Redirección á información ou a "
-#~ "historia da paxina para OSM primitiva pribablemente fallará. API base URL "
-#~ "é: \"{0}\""
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Por favor introduce unha latitude no rango de -90..90"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Por favor escolle unha latitude válida, no rango -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Por favor escolle unha latitude válida no rango -180..180"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Por favor escolle unha latitude válida, no rango -180..180"
-
-#~ msgid "Download Object..."
-#~ msgstr "Descargar Obxecto..."
-
-#~ msgid "Download Object"
-#~ msgstr "Descargar Obxecto"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Alternar a vista de pantalla completa"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Vista de Pantalla Completa"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" non esta pechada e polo tanto non pode ser unido"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Só ata 2 áreas poden ser unidas a un tempo"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Une Areas: Borra Vías"
-
-#~ msgid "Closed Way"
-#~ msgstr "Vía Pechada"
-
-#~ msgid "Fix relations"
-#~ msgstr "Arranxar relacións"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Areas auto-superpostas unidas"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Misturar os primiotivos acuais dentro de outra capa"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "a {0} primitiva"
-#~ msgstr[1] "a {0} primitivas"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Arrastra un sergmento de via para facer un rectangulo. Ctrl-arrastra para "
-#~ "mover o segmento ao longo da sua normal."
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Obxecto \"{0}\" purgado"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Borrando referencia da relación {0}"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Francia)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 sistema geodesico del norte"
-
-#~ msgid "Set width of building"
-#~ msgstr "Establecer ancho de edificios"
-
-#~ msgid "Grab buildings"
-#~ msgstr "Agarrar construccións"
-
-#~ msgid "World"
-#~ msgstr "Mundo"
-
-#~ msgid "Add grid"
-#~ msgstr "Engadir malla"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Os Multipoligonos deben consistir só de vias pechadas."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Debes escoller al menos dúas vías."
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Non se puido crear un novo bug. Resultou {0}"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Imaxe non creada apropiadamente."
-
-#~ msgid "change the selection"
-#~ msgstr "cambiar a selección"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Un engadido que permirte que JOSM sexa controlado por outras aplicacións"
-
-#~ msgid "create new objects"
-#~ msgstr "crear novo obxecto"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Accións permitidas"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Configuración do engadido Control Remoto"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urbán"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topografico"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Non se atopou obxectivo para misturar o obxecto con id {0}"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Non se puido escribir no marcador.<br>{0}</html>"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Misturando primitivas borradas fallou"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Descargar as primitivas referenciando a unha das primitivas escollidas"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Os datos copiados conteñen primitivas incompletas. Ao pegar borraranse as "
-#~ "primitivas incompletas. ¿Quere pegar os datos sen as primitivas "
-#~ "incompletas?"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Erro na sintáxis do patrón: O patrón {0} de {1} non é válido!"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Atención: A capa \"{0}\" xa non existe. Non se pode eliminar o conflicto "
-#~ "para a primitiva \"{1}\"."
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Restaurar {0} primitiva"
-#~ msgstr[1] "Restaurar {0} primitivas"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "O obxecto con ID {0} e versión {1} é visible a través da fonte do obxecto "
-#~ "con versión anterior {2} non é visible. Non podemos manexat esta "
-#~ "inconsistencia. Mantendo o obxecto. "
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "O estilo da vía interior \"{0}\" é igual á do multipolígono"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "O estilo da vía exterior \"{0}\" non coincide."
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Comunicación fallida co servidor"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "non visible (no servidor)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visible (no servidor)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Estado visible:"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Manter unha copia da versión local"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Mantener o seu estado visible"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reiniciar o id a 0"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Sí, purgalo"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Manter o meu estado visible"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Sí, reiniciar  o id"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Erro: Liña inesperada \"{0}\" na lista de marcadores do servidor"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>A capa \"{0}\" ainda ten un conflicto coa primitiva<br>\"{1}\"."
-#~ "<br>Este conflicto non pode ser engadido.</html>"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Erro: Dobre valor ilegal \"{0}\" na liña \"{1}\" na  lista de marcadores "
-#~ "do servidor"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Fallou ao cargar os  marcadores de \"{0}\" por motivos de seguridade. A "
-#~ "Excepción foi: {1}"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "As seguinte primitivas non poden ser copiadas á primitiva  de destino<br> "
-#~ "porque foron eliminadas no conxunto de datos de destino:"
-
-#~ msgid "standard"
-#~ msgstr "estándar"
-
-#~ msgid "Amenities"
-#~ msgstr "Servizos"
-
-#~ msgid "tower"
-#~ msgstr "torre"
-
-#~ msgid "line"
-#~ msgstr "liña"
-
-#~ msgid "minor_line"
-#~ msgstr "baixa tensión"
-
-#~ msgid "gray"
-#~ msgstr "gris"
-
-#~ msgid "brown"
-#~ msgstr "marrón"
-
-#~ msgid "black"
-#~ msgstr "negro"
-
-#~ msgid "white"
-#~ msgstr "branco"
-
-#~ msgid "blue"
-#~ msgstr "azul"
-
-#~ msgid "red"
-#~ msgstr "vermello"
-
-#~ msgid "any substance"
-#~ msgstr "calquer substancia"
-
-#~ msgid "overground"
-#~ msgstr "na superficie"
-
-#~ msgid "underwater"
-#~ msgstr "sumerxido"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Hay {0} primitivas no seu conxunto de datos local que<br>poden "
-#~ "estar borradas no servidor. Si posteriormente trata de borralas ou "
-#~ "<br>actualizalas probablemente o servidor informará de un <br>conflicto."
-#~ "<br><br>Pulse <strong>{1}</strong> para comprobar o estado de estas "
-#~ "primitivas<br>no servidor-<br>Pulse <strong>{2}</strong> para ignorar."
-#~ "<br></html>"
-
-#~ msgid "Edit Football"
-#~ msgstr "Editar fútbol americano"
-
-#~ msgid "Football"
-#~ msgstr "Fútbol americano"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Deportes de motor"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Editar deportes de motor"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Editar rugby"
-
-#~ msgid "Man-Made"
-#~ msgstr "Artificial"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Indipend."
-#~ msgstr "Indipend."
-
-#~ msgid "Travel"
-#~ msgstr "Viaxes"
-
-#~ msgid "Accomodation"
-#~ msgstr "Aloxamiento"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "football"
-#~ msgstr "fútbol"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Nodo en vía fluvial"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} "
-#~ "</html>"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no "
-#~ "servidor.<br><br>Quere que ese nodo volva a existir?"
-#~ msgstr[1] ""
-#~ "Hai {0} nodos adicionais usados pola vía {1}<br>que foron eliminados no "
-#~ "servidor.<br><br>Quere que eses nodos volvan a existir?"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Eliminar fisicamente do conxunto de cambios local"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "senda alpina esixente"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "senda alpina difícil"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "senda de montaña"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "senda de montaña esixente"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "senda alpina"
-
-#~ msgid "Goods"
-#~ msgstr "Mercancías"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Altura max. (en metros)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Anchura max. (en metros)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Lonxitude max. (en metros)"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Non se puido cargar o complemento {0} porque o complemento <br>main "
-#~ "class \"{1}\" non se atopou.<br>Borrar das preferencias?"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copiar a/as escolla/s por defecto"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Introduce un nome de menú e unha URL WMS"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Escoller, mover e rotar obxectos"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM terá que borrar a túa primitiva local con id {0}<br>do "
-#~ "conxunto de datos.<br>Esta de acordo?</html>"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflicto entre estados visibles sen resolver"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Eliminar do conxunto de datos"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Aplicar tamen aos fillos"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Escoller primitivas presentadas por este usuario"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Un verificador de datos de OSM. Busca problemas nos datos,e propón "
-#~ "arreglos para os erros mais comúns. Integra corrector para as etiquetas "
-#~ "de nome."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Permitir outras aplicacións enviar ordes a JOSM."
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Descargar e amosar a historia das primitivas escollidas"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplica Vías con un desplazamento"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "ID especificado inválido. Non se pode descargar o obxecto."
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Hay {0} primitiva adicional referida na relación a {1}<br>a cal está "
-#~ "borrada no servidor.<br><br>Desexa recuperala tamén?"
-#~ msgstr[1] ""
-#~ "Hay {0} primitivas adicionais referidas nas relacións a {1}<br>as cales "
-#~ "están borradas no servidor.<br><br>Desexa recuperalas tamén?"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Axustar a visualización na capa de datos actual ás primitivas contidas na "
-#~ "modificación"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr ""
-#~ "Axustar a visulización das primitivas correspondentes na capa de datos "
-#~ "actual"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Varios membros referidos á mesma primitiva"
-
-#~ msgid "With kiosk"
-#~ msgstr "Con tenda"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Amosa imaxes xeorreferenciadas como fondo en JOSM (servidores WMS, Yahoo, "
-#~ "etc.)"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Amosa unha malla do mapa desplazable en JOSM. Poide cargar teselas dende "
-#~ "o mapa desplazable e solicitar actualizacións."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Amosa unha imaxe OpenLayer de fondo"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Crea multipolígonos mediante un só clic, moito máis facil que a forma "
-#~ "estándar co editor de relacións."
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "Requírese unha vía co papel <tt>a</tt> nunha restricción de xiro."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr "Requírese unha vía co papel <tt>de</tt> nunha restricción de xiro."
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "A <strong>from</strong>-via <span class=\"object-name\">{0}</span> e a "
-#~ "<strong>to</strong>-via <span class=\"object-name\">{1}</span> "
-#~ "intersecanse no nodo <span class=\"object-name\">{2}</span> pero <span "
-#~ "class=\"object-name\">{2}</span>non é<strong>vía</strong>-obxxecto.<br> É "
-#~ "recomendable poñer <span class=\"object-name\">{2}</span> como única "
-#~ "<strong>via</strong>-obxecto."
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Engadir unha vía OSM co papel \"de\""
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Engadir unha vía OSM co papel \"a\""
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "Por favor, escolla manualmente unha vía OSM no Editor Básico."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Cambia ao Editor Básico e escolle unha vía OSM"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Unha vía OSM é requerida."
-
-#~ msgid "Grid"
-#~ msgstr "Rede"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Vía duplicada"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Vías escollidas duplicadas."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Crear vía duplicada"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Por favor axusta a capa WMS manualmente usando obxectos/trazas... exactas "
-#~ "antes de empezar a mapear"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "A proxección actual está definida a {0}"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "set {0}"
-#~ msgstr "establecer {0}"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr ""
-#~ "O nivel de zoom non e era o suficiente para grabar un desprazamento "
-#~ "preciso"
-
-#~ msgid "OpenLayers"
-#~ msgstr "Abrir as capas"
-
-#~ msgid "Load file"
-#~ msgstr "Cargar arquivo"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Engadir todas as primitivas escollidas no conxunto de cambios actual "
-#~ "antes do primeiro membro"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Engadir todas as primitivas escollidas no conxunto de cambios actual "
-#~ "despois do ultimo membro"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Engadir todas as primitivas escollidas no conxunto de cambios actual "
-#~ "antes do primeiro membro escollido"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Engadir todas as primitivas escollidas no conxunto de cambios actual "
-#~ "despois do ultimo membro escollido"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Borrar todas as referencias dos membros a unha das primitivas escollidas"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "Escoller relación na selección actual"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Escoller membros da relación na selección actual que se refiren {0} "
-#~ "primitivas"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Escoller primitivas para os membros das relacións escollidos"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "pista"
-#~ msgstr[1] "pistas"
-
-#~ msgid "image "
-#~ msgstr "imaxe "
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Ampliación automática: "
-
-#~ msgid "farmland"
-#~ msgstr "terras de cultivo"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Introduza un filtro para a cadea."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Introduza unha cadea de busca"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Está a estabelecer unha regra baleira en {0} primitiva."
-#~ msgstr[1] "Está a estabelecer unha regra baleira en {0} primitivas."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Premer para descargar a área escollida actualmente"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "reemplazado polo complemento {0}"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Cambiar as propiedades de 1 obxecto"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr "Ten {0} elementos escollidos. Pero só pode editar un elemento!"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "establecer proxección dende {0} ata {1}"
-
-#~ msgid "load data from API"
-#~ msgstr "cargar datos da API"
-
-#~ msgid "import data from URL"
-#~ msgstr "importar datos da URL"
-
-#~ msgid "read protocol version"
-#~ msgstr "ler versión de protocolo"
-
-#~ msgid "autozoom"
-#~ msgstr "auto aumentar"
-
-#~ msgid "it works realy fine"
-#~ msgstr "funciona realmente ben"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "mapeando marcas do mar"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% da pista GPS"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Axustar a posición da capa WMS escollidas"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} vai funcionar pero o control remoto para este complemento está "
-#~ "deshabilitado.\n"
-#~ "Debería actualizar os complementos."
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: Problema co Control remoto"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "Engadir URL de WMS"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Permitir control remoto (require o complemento remotecontrol)"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (espello)"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Datos con erros. Enviar de todos modos?"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Combinacións de etiqueta/valor ilegal"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Conflicto no atributo 'visible' para o obxecto do tipo {0} co id {1}"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "Non foi posíbel ler os datos de osm autogardados ({0}) - {1}"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Lanzar navegador coa axuda da wiki para o obxeto escollido"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>A relación filla<br>{0}<br>está borrada no servidor. Non pode ser "
-#~ "cargada"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Esto é igual a borrar os papeis de esas primitivas"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">O contido de axuda para tema non "
-#~ "existe</p><p class=\"warning-body\">O contído de axuda para o tema de "
-#~ "axuda<strong>{0}</strong> aínd anon está dispoñible. Falta tanto na túa "
-#~ "lingua ({1}) e en inglés.<br><br>Axuda a millorar o sistema de axuda "
-#~ "enchendo a información faltante. Pode tanto ediitar o tema de axuda <a "
-#~ "href=\"{2}\">no seu idioma local ({1})</a> e o tema de axuda <a href="
-#~ "\"{3}\">en inglés</a>.</p></html>"
-
-#~ msgid "Seamarks"
-#~ msgstr "Marcas do mar"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Escoller unha vía única e pechada para polo menos catro nodos."
-
-#~ msgid "OSM-Cert"
-#~ msgstr "Certificado-OSM"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "Orde para executar GnuPG"
-
-#~ msgid "Privacy"
-#~ msgstr "Privacidade"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "Non preguntar outra vez por a chave"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Configuracións para o complemento SlippyMap."
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Nivel máximo de ampliamento: "
-
-#~ msgid "Used style"
-#~ msgstr "Estilo en uso"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Engadir un nome de ficheiro ou unha URL de un estilo activo"
-
-#~ msgid "Internal style"
-#~ msgstr "Estilo interno"
+#~ "Aviso: ignorando excepción porque o traballlo foi cancelado. A excepción "
+#~ "foi: {0}"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Abrir un editor para a restrición de xiro escollida"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 26529)
+++ applications/editors/josm/i18n/po/he.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:20+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:34+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:35+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "עזרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "אזהרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "הפרמטר \"downloadgps\" אינו מקבל שמות קובץ או כתובות URL של קבצים"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -135,13 +136,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -161,7 +162,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -171,6 +172,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,5 +202,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -383,6 +384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -409,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -415,7 +416,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -423,5 +425,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -630,5 +632,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -875,5 +877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -882,5 +884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1061,6 +1063,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1211,5 +1213,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1425,6 +1427,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "כתובת"
@@ -2066,5 +2068,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2364,7 +2366,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr ""
@@ -2615,5 +2617,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2739,10 +2741,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2905,5 +2907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3463,5 +3465,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3512,40 +3514,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
+msgid "Set {0}={1} for node ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
-#, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3667,4 +3669,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3961,6 +3964,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -3997,5 +4000,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4099,5 +4102,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4199,5 +4202,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4216,8 +4219,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4357,50 +4360,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "מרקטור"
@@ -4425,80 +4442,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4718,45 +4755,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5025,5 +5062,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5048,5 +5085,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5057,5 +5094,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5461,5 +5498,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5525,5 +5562,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "כביש ראשי"
@@ -5531,5 +5568,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5537,10 +5574,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "נתיב מים"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr ""
@@ -5550,5 +5587,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5562,5 +5599,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5573,5 +5610,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5929,5 +5966,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6036,4 +6073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6132,5 +6170,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6173,5 +6211,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6458,6 +6496,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6693,10 +6731,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "שמור את הקואורדינטות שלי"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "שמור את הקואורדינטות שלהם"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6752,6 +6790,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6773,6 +6811,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7159,5 +7197,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7394,5 +7432,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7606,7 +7644,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "לא ידוע"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7870,5 +7938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7888,5 +7956,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7903,5 +7971,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7909,5 +7977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -7950,5 +8018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7956,5 +8024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8146,5 +8214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8244,5 +8312,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "משתמש"
@@ -9236,5 +9303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9416,5 +9483,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9557,4 +9624,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9566,4 +9634,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9826,9 +9900,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9837,13 +9911,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9856,18 +9930,19 @@
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "לשנות ערכים?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9876,5 +9951,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9884,5 +9959,5 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9891,27 +9966,31 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "נא בחר ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "תכונות\\חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "תכונות לעצמים שנבחרו."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9920,62 +9999,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10039,8 +10118,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10063,5 +10144,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10391,9 +10472,4 @@
 msgstr "נמצאו {0} התנגשויות במהלך היבוא"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10433,10 +10509,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10711,37 +10781,4 @@
 msgstr "סוג"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "לא ידוע"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10857,20 +10894,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -10962,5 +10999,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11496,8 +11533,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11899,4 +11936,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11922,11 +11960,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12003,38 +12034,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "התאם צבעים"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "ברירת מחדל"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "בחר צבע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "שם: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "תיאור: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12045,9 +12076,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12055,26 +12086,26 @@
 msgstr "תיאור"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12083,8 +12114,8 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12093,12 +12124,12 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "נקודת gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12107,10 +12138,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12118,78 +12149,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12200,11 +12231,11 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12212,6 +12243,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12221,27 +12252,27 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "סמנים מנקודות בעלות שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "ייבא שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12251,29 +12282,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "קובץ שמע (wav.*)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "סמן שמע מ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "ייבא תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12377,5 +12408,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12385,57 +12416,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "טען משטח"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "טען את כל המשטחים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "הגדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "הקטן"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -12966,10 +13005,10 @@
 msgstr "תמונות JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "סמן gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -12977,5 +13016,5 @@
 msgstr[1] "סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -12984,41 +13023,41 @@
 msgstr[1] "{0} מורכב מ-{1} סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "סנכרן שמע"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13042,13 +13081,13 @@
 msgstr "לא יכול ליצור סמן שמע חדש."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "היתה שגיאה בניסיון להציג את הכתובת לסמן זה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(הכתובת היתה: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "שגיאה בהצגת URL"
@@ -13982,82 +14021,82 @@
 msgstr "צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "צייר חיצי כיוון"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "רק בראשית הדרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "צייר מספרים סידוריים של קטע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "צייר גבולות של נתונים שהורדו"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "צייר נקודות וירטואליות במצב הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "צייר שכבות לא פעילות בצבע שונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "החלק גרפיקה של מפה (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "נקודות GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "צייר רמזי כיוון עבור קטעי דרך."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "צייר את גבולות המידע שמורד מהשרת."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14065,15 +14104,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "נתוני OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "השתמש בהגדרות הגלובליות."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14084,47 +14159,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "הכרח קווים במידה ולא יובאו מקטעים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "צייר נקודות GPS גדולות."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14132,5 +14199,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14154,5 +14221,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14195,5 +14262,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14207,38 +14274,18 @@
 msgstr "רגל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "ציור מהיר (נראה מכוער יותר)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14247,10 +14294,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14258,35 +14305,35 @@
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "אורך מירבי (מטרים)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14294,14 +14341,14 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "מרחק מינימלי (פיקסלים)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14309,13 +14356,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14323,27 +14370,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15003,5 +15068,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15093,5 +15158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "אפס"
@@ -15368,5 +15433,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15752,5 +15817,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15779,9 +15844,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16059,6 +16124,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16381,5 +16446,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16591,5 +16656,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -16977,4 +17042,9 @@
 msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17766,4 +17836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -17883,4 +17955,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18446,5 +18532,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34745,4 +34831,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34759,6 +34846,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34777,15 +34864,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "שםרחוב מקוצר"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "תג חד-סטרי על נקודה"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "תג גשר על נקודה"
@@ -34796,12 +34883,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "תווית דרך מהירה שגויה לנקודה"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr ""
@@ -34810,16 +34897,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "דרך מהירה ללא תווית מזהה"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "סוג דרך מהירה זמני"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "שגיאת כתיב בשם מפתח"
@@ -34829,10 +34916,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "דרך אופניים ללא תווית \"אופניים\""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "שביל להולכי רגל ללא תווית \"רגל\""
@@ -34841,10 +34928,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "מחסום מוגדר על דרך"
@@ -34853,35 +34940,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "מהירות מירבית מוגדרת לשביל להולכי רגל"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "תווית שכבה עם סימן +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "שם רחוב מכיל ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr ""
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "מסעדה בלי שם"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "צירוף תגיות לא רגיל"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -34986,117 +35082,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr ""
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr ""
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35341,5 +35447,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr ""
 
@@ -35442,9 +35548,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35462,23 +35568,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35486,26 +35622,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "מידע"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35513,5 +35677,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35622,9 +35786,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35723,17 +35887,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36364,28 +36545,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36503,6 +36691,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37384,5 +37572,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37392,17 +37580,17 @@
 "מסלולים, ראה כאן:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "צייר קווים בין נקודות בשכבה זו."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "אל תצייר קווים בין נקודות בשכבה זו."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "בחר אפשרויות ציור קו"
@@ -37554,5 +37742,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37560,10 +37748,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37572,5 +37760,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37579,6 +37767,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37587,9 +37775,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37748,71 +37936,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37820,32 +38016,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -37880,6 +38070,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38010,30 +38200,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38722,5 +38925,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38737,5 +38940,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39464,17 +39667,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39488,36 +39691,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40139,5 +40338,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41105,4 +41304,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41322,6 +41538,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41568,5 +41784,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42137,5 +42353,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42521,1537 +42737,13 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "הזז"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "פתח את עמוד ההעדפות להגדרות כלליות."
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "No data imported."
-#~ msgstr "לא יובאו נתונים."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "נא הזן שם עבור המיקום."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "נא הזן את נקודות הציון הרצויות תחילה."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "בחר סימניה תחילה."
-
-#~ msgid "File could not be found."
-#~ msgstr "לא ניתן למצוא את הקובץ."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "העלה את כל השינויים לשרת ה-OSM"
-
-#~ msgid "Uploading data"
-#~ msgstr "מעלה נתונים"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "עדיין לא הוטמע."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "סיומת הקובץ אינה ידועה."
-
-#~ msgid "gps track description"
-#~ msgstr "תיאור מסלול GPS"
-
-#~ msgid "Email"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Load Selection"
-#~ msgstr "טען בחירה"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "צור קשר עם {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "מוריד..."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "התנגשויות מתמזגות"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "נא הזן מחרוזת לחיפוש."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "רענן את רשימת הבחירה."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "מחק את השכבה הנבחרת."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "מסלול בעל נקודה {0}"
-#~ msgstr[1] "מסלול בעל {0} נקודות"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "נקודה"
-#~ msgstr[1] "נקודות"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} נמחק/ו.)"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "ארעו התנגשויות במהלך הייבוא."
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "נקודה {0}"
-#~ msgstr[1] "{0} נקודות"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "התחלת GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "הפרש נוכחי: {0}ש'"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "סיום GPS: {0}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "אין זמן לנקודה {0} x {1}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "הפרש אזורי הזמן: "
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} מתוך הרצועה."
-
-#~ msgid "Sync clock"
-#~ msgstr "סנכרן שעון"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "תמונה"
-#~ msgstr[1] "תמונות"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "לא ניתן לכתוב סימניות."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "לא ניתן לקרוא את הסימניות."
-
-#~ msgid "layer not in list."
-#~ msgstr "השכבה אינה ברשימה."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "לא ניתן לנתח את הזמן שהוזן."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "שינויים לא שמורים"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "יוצר קשר עם שרת ה-OSM..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "שגיאה בעת פיענוח"
-
-#~ msgid "their version:"
-#~ msgstr "הגירסה שלהם:"
-
-#~ msgid "resolved version:"
-#~ msgstr "הגירסה הפתורה:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:"
-#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:"
-
-#~ msgid "my version:"
-#~ msgstr "הגירסה שלי:"
-
-#~ msgid "Faster Forward"
-#~ msgstr "הרצה מהירה"
-
-#~ msgid "Previous Marker"
-#~ msgstr "הסמן הקודם"
-
-#~ msgid "Play previous marker."
-#~ msgstr "נגן את הסמן הקודם."
-
-#~ msgid "Slower Forward"
-#~ msgstr "הרצה איטית יותר"
-
-#~ msgid "Jump forward"
-#~ msgstr "קפוץ הלאה"
-
-#~ msgid "Play next marker."
-#~ msgstr "נגן את הסמן הבא."
-
-#~ msgid "Next Marker"
-#~ msgstr "הסימון הבא"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "לשלב שתי דרכים בעלות חברויות שונות?"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "הזן ערכים לכל ההתנגשויות."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "כל הדרכים היו ריקות"
-
-#~ msgid "Jump back."
-#~ msgstr "עבור אחורה."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "אנא בחר בדיוק שלושה צמתים או דרך אחת עם שלושה צמתים בדיוק."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "צמתים אלה אינם בעיגול."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "אנא בחר לפחות משימה אחת להורדה"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "ניתן לערוך דפי עזרה מהעזרה המקוונת של JOSM בלבד"
-
-#~ msgid "Open in Browser"
-#~ msgstr "פתח בדפדפן"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "עזרה מקוונת עבור JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "שגיאה בעת טעינת העמוד {0}"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "הצגת נתונים היסטוריים אודות הדרכים או הצמתים ב־OSM."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "לחץ למחיקה. Shift: מחק מקטע דרך. Alt: אל תמחק צמתים שאינם בשימוש בעת "
-#~ "מחיקת דרך. Ctrl: מחק פריטים מפנים."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "בחר, הזז והטה פריטים"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "גרור מקטע דרך ליצירת מרובע"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "אנא בחר לפחות שני צמתים למיזוג."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "למזג צמתים בעלי חברויות שונות?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
-
-#~ msgid "Create a new map."
-#~ msgstr "צור מפה חדשה."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "לא ניתן לשנות את שם הקובץ \"{0}\"."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל "
-#~ "תקלה."
-
-#~ msgid "Do not show again"
-#~ msgstr "אל תציג שוב"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "אנא דווח על {0}"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "אירעה שגיאה בלתי צפויה\n"
-#~ "\n"
-#~ "זוהי תמיד בעית קידוד. אם אתה מריץ את הגירסא\n"
-#~ "האחרונה של JOSM, היה נחמד ודווח על התקלה."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "לא ניתן להסיר את התוסף. אנא ספר למי שסיפק לך את JOSM על הבעיה."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "כלול את הצעדים לקבלת השגיאה (בפירוט רב ככל האפשר)!"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr "נסה לעדכן לגירסא האחרונה של JOSM וכל התוספים לפני דיווח על תקלה."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "וודא שכללת את המידע הבא:"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר."
-
-#~ msgid "Preparing data..."
-#~ msgstr "מכין נתונים..."
-
-#~ msgid "Error during parse."
-#~ msgstr "שגיאה בזמן הניתוח."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, כנראה שחסרים תגים."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "נמצא <nd> שלא בתוך דרך."
-
-#~ msgid "Unknown version"
-#~ msgstr "גרסה לא ידוע"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "ל <nd> אין התייחסות (ref)"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
-
-#~ msgid "Commit comment"
-#~ msgstr "הערת ביצוע"
-
-#~ msgid "Preparing..."
-#~ msgstr "מכין..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "סיסמא או שם משתמש שגויים."
-
-#~ msgid "Aborting..."
-#~ msgstr "מבטל..."
-
-#~ msgid "Enter Password"
-#~ msgstr "הכנס סיסמא"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):"
-
-#~ msgid "Uploading..."
-#~ msgstr "מעלה..."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr "אזהרה - התבקשה טעינת התוסף {0}. התוסף כבר לא נדרש."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "תוסף לא נמצא: {0}"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "תוסף דורש את עדכון JOSM: {0}."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "עצם לא חוקי עם id=0"
-
-#~ msgid "to"
-#~ msgstr "אל"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "מקורות מידע וסוגים"
-
-#~ msgid "Download Area"
-#~ msgstr "הורדת איזור"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "ערך ריק מוחק את המפתח."
-
-#~ msgid "Edit Properties"
-#~ msgstr "ערוך מאפיינים"
-
-#~ msgid "Occupied By"
-#~ msgstr "תפוס ע\"י"
-
-#~ msgid "Add Selected"
-#~ msgstr "הוסף את הנבחרים"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "לא יכול להתחבר לשרת"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "שגיאה בניתוח תשובת השרת."
-
-#~ msgid "Members: {0}"
-#~ msgstr "חברים: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "מחברים: {0}"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "הצג\\הסתר טקסט\\סמלים"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "שכבות: {0}"
-
-#~ msgid "name"
-#~ msgstr "שם"
-
-#~ msgid "Length: "
-#~ msgstr "אורך: "
-
-#~ msgid "Images for {0}"
-#~ msgstr "תמונות עבור {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "קורא GPX..."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "שם משתמש OSM (אי-מייל)"
-
-#~ msgid "OSM password"
-#~ msgstr "סיסמת OSM"
-
-#~ msgid "No plugin information found."
-#~ msgstr "מידע על התוסף לא נמצא."
-
-#~ msgid "Download List"
-#~ msgstr "הורד רשימה"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "כל התוספים המותקנים מעודכנים."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: גירסא {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "עדכן את התוספים הבאים:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "שגיאה במחיקת קובץ התוסף: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "התוסף כבר קיים"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "הורד תוספים חסרים"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "הורד את התוספים הבאים?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "שגיאה בקריאת קובץ המידע של התוסף: {0}"
-
-#~ msgid "Proxy server host"
-#~ msgstr "מארח שרת פרוקסי"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "הגדרות פרוקסי"
-
-#~ msgid "Anonymous"
-#~ msgstr "אנונימי"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "אפשר שרת פרוקסי"
-
-#~ msgid "Proxy server port"
-#~ msgstr "פורט שרת פרוקסי"
-
-#~ msgid "Proxy server username"
-#~ msgstr "שם משתמש שרת פרוקסי"
-
-#~ msgid "Proxy server password"
-#~ msgstr "סיסמת שרת פרוקסי"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "אשר את כל פעולות השלט רחוק ידנית"
-
-#~ msgid "load data from API"
-#~ msgstr "טען נתונים מ API"
-
-#~ msgid "change the selection"
-#~ msgstr "שנה את הבחירה"
-
-#~ msgid "Permitted actions"
-#~ msgstr "פעולות מורשות"
-
-#~ msgid "near"
-#~ msgstr "קרוב"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "נא הזן מחרוזת לחיפוש"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "ייבא קובץ TCX..."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "כמה מהנקונות הן (כמעט) באותו קו"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "אירעה שגיאה במהלך שמירה"
-
-#~ msgid "Could not back up file."
-#~ msgstr "לא יכול לגבות קובץ."
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "חסרים ארגומנטים ל-or."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "חסרים ארגומנטים ל-not."
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "בחירה חייבת לכלול רק דרכים."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "מותרות רק שתי נקודות"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות"
-
-#~ msgid "Only one node selected"
-#~ msgstr "נבחרה רק נקודה אחת"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "השתמש במעלות עשרוניות."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "הכנס את הקורדינטות של הנקודה החדשה."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר."
-
-#~ msgid "Don't apply changes"
-#~ msgstr "אל תחל את השינויים"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "שכפל את הדרכים הבחורות"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "שכפל דרך"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "ייצר דרך משוכפלת"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)"
-
-#~ msgid "Set the language."
-#~ msgstr "קבע את השפה."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "ישנה בעיה עם התוספים הבאים:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "עדכן תוספים"
-
-#~ msgid "File not found"
-#~ msgstr "קובץ לא נמצא"
-
-#~ msgid "Rotate"
-#~ msgstr "סובב"
-
-#~ msgid "Change"
-#~ msgstr "שנה"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "מחק {1}{0}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "מחק {0}{1}"
-
-#~ msgid "position"
-#~ msgstr "מיקום"
-
-#~ msgid "false"
-#~ msgstr "שקר"
-
-#~ msgid "true"
-#~ msgstr "אמת"
-
-#~ msgid "Split way segment"
-#~ msgstr "פצל קטע דרך"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "מעלות דקות שניות"
-
-#~ msgid "S"
-#~ msgstr "דרום"
-
-#~ msgid "N"
-#~ msgstr "צפון"
-
-#~ msgid "W"
-#~ msgstr "מערב"
-
-#~ msgid "E"
-#~ msgstr "מזרח"
-
-#~ msgid "different"
-#~ msgstr "שונה"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "התאם את מיקום שכבת WMS"
-
-#~ msgid "Exception occurred"
-#~ msgstr "אירעה שגיאה"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "עזרת תוסף WMS"
-
-#~ msgid "Help / About"
-#~ msgstr "עזרה \\ אודות"
-
-#~ msgid "Grid layer:"
-#~ msgstr "שכבת רשת:"
-
-#~ msgid "help"
-#~ msgstr "עזרה"
-
-#~ msgid "World"
-#~ msgstr "עולם"
-
-#~ msgid "Grid layout"
-#~ msgstr "מתאר רשת"
-
-#~ msgid "Grid origin location"
-#~ msgstr "מיקום רשת מקורי"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "הורד משטח WMS מ-{0}"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "בחר שורה להעתקה"
-
-#~ msgid "Grid rotation"
-#~ msgstr "סיבוב רשת"
-
-#~ msgid "Navigation"
-#~ msgstr "ניווט"
-
-#~ msgid "standard"
-#~ msgstr "סטנדרטי"
-
-#~ msgid "requested: {0}"
-#~ msgstr "התבקש: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "שגיאה בבקשת עדכון"
-
-#~ msgid "Tile Sources"
-#~ msgstr "מקורות משטחים"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "פותח תמונות ב-AgPifoJ..."
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "אני באזור זמן: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "פתח תמונה אחרת"
-
-#~ msgid "Update position for: "
-#~ msgstr "עדכן מיקום עבור: "
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "תמונות שעדיין לא תויגו"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "תמונות ללא מיקום exif"
-
-#~ msgid "All images"
-#~ msgstr "כל התמונות"
-
-#~ msgid "Please select some data"
-#~ msgstr "בחר נתונים"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "פתח דף משתמש בדפדפן"
-
-#~ msgid "Select User's Data"
-#~ msgstr "בחר נתוני משתמש"
-
-#~ msgid "Open User Page"
-#~ msgstr "פתח דף משתמש"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "מצטער, לא עובד עם משתמשים אנונימיים"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "מאפייני תוסף WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "כתובת WMS"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "הזן שם תפריט וכתובת WMS"
-
-#~ msgid "Copy Default"
-#~ msgstr "העתק ברירת מחדל"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "כתובת WMS (ברירת מחדל)"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>תודה על ההבנה</p>"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "מפעיל תוספים מעודכנים"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "קובץ המאפיינים מכיל שגיאות. מגבה קובץ ישן ל {0}"
-
-#~ msgid "Error: {0}"
-#~ msgstr "שגיאה: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "אזהרה: {0}"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ'1-' לציור כל הקווים"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "שם כניסה (אי-מייל) לחשבון OSM."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "אפשר ברירות מחדל מובנות"
-
-#~ msgid "Keep backup files"
-#~ msgstr "שמור קובצי גיבוי"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "התאם אתרים..."
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "ארכיון התוסף כבר זמין. האם אתה רוצה להוריד את הגירסא הנוכחית ולמחוק את "
-#~ "הארכיון הקיים?\n"
-#~ "{0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "התנגשויות: {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "ישנם שינויים לא שמורים. מחק את השכבה בכל זאת?"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "תוויות (ערך ריק מוחק את התווית)"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "מזג את השכבה מתחת לתוך השכבה הבחורה."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "האם אתה באמת רוצה למחוק את כל השכבה?"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "מצבור פקודות: {0}"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "לחץ \"טען מחדש\" כדי לרענן את הרשימה"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "לא יכול ליצור תקלה חדשה. תוצאה: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "באמת סמן פריט זה כ-\"הושלם\"?"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "כיוונונים לתוסף \"שלט רחוק\""
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "ייבא קובץ TCX כמסלולי GPS"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "תוסף ה\"שלט רחוק\" מאזין תמיד על פורט 8111 במחשב המקומי (localhost). "
-#~ "הפורט לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף."
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת"
-
-#~ msgid "Grid"
-#~ msgstr "שריג"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "תקן את השגיאות הבחורות."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "התעלם מהשגיאות הבחורות בעתיד."
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "צירופי תווית \\ ערך לא חוקיים"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "נקודות לא מחוברות וללא תוויות"
-
-#~ msgid "Painting problem"
-#~ msgstr "בעיית ציור"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "נתונים עם שגיאות. להעלות בכל זאת?"
-
-#~ msgid "start"
-#~ msgstr "התחלה"
-
-#~ msgid "end"
-#~ msgstr "סוף"
-
-#~ msgid "Request Update"
-#~ msgstr "בקש עדכון"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "הראה מצב משטח"
-
-#~ msgid "image not loaded"
-#~ msgstr "תמונה לא נטענה"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "סנכרן את השעה עם יחידת ה-GPS"
-
-#~ msgid "Public"
-#~ msgstr "ציבורי"
-
-#~ msgid "No password provided."
-#~ msgstr "לא סופקה סיסמא."
-
-#~ msgid "No username provided."
-#~ msgstr "לא סופק שם משתמש."
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "בחר משתמש בעזרת פאנל המחברים"
-
-#~ msgid "Boat"
-#~ msgstr "סירה"
-
-#~ msgid "Motorboat"
-#~ msgstr "סירת מנוע"
-
-#~ msgid "Cycleway"
-#~ msgstr "שביל אופניים"
-
-#~ msgid "Footway"
-#~ msgstr "שביל להולכי רגל"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "ערוך צעידה הררית מאומצת"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "צעידה אלפינית"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "ערוך צעידה אלפינית"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "ערוך צעידה"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "צעידה הררית"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "ערוך צעידה הררית"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "צעידה הררית מאומצת"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} תוסף עודכן בהצלחה. נא לאתחל את JOSM."
-#~ msgstr[1] "{0} תוספים עודכנו בהצלחה. נא לאתחל את JOSM."
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "הפעלת התוספים המעודכנים נכשלה. בדוק אם יש ל-JOSM הרשאה לדרוס את התוספים "
-#~ "הקיימים."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr "כנראה שהתוסף {0} אינו תקין או שאי אפשר להוריד אותו בצורה אוטומטית."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות "
-#~ "התצורה 'pluginmanager.warntime')."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "לא יכול להוריד תוסף: {0} מ{1}"
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון "
-#~ "שעצמים אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "הסר \"{0}\" מ-{1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "הסר \"{0}\" מ-{1} \"{2}\""
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "פתור {0} התנגשויות ב{1} עצמים"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "משפטים לא תקינים: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "משפטים לא ידועים: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "שגיאות Checksum: "
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "העלה ל-OSM..."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "העלה את השינויים האלה?"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "שגיאה בניתוח כתובת: \"{0}\""
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "לא יכול לקרוא מכתובת: \"{0}\""
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "ציפיתי לסוגר סוגריים."
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>...-עצמים עם מספר הנקודות הנתון"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} מורכב ממסלול {1}"
-#~ msgstr[1] "{0} מורכב מ-{1} מסלולים"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "קבע {0}={1} עבור {2} \"{3}\""
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "קבע {0}={1} עבור {2} {3}"
-
-#~ msgid "History of Element"
-#~ msgstr "ההיסטוריה של האלמנט"
-
-#~ msgid "change the viewport"
-#~ msgstr "שנה נקודת מבט"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "מחק איבר \"{0}\" ביחס."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "איבר ריק ביחס."
-
-#~ msgid "Edit new relation"
-#~ msgstr "ערוך יחס חדש"
-
-#~ msgid "Create new relation"
-#~ msgstr "צור יחס חדש"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "ערוך יחס מספר {0}"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "הסר את כל העצמים הנבחרים מהיחס"
-
-#~ msgid "Remove Selected"
-#~ msgstr "הסרת הנבחרים"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "הוסף את כל העצמים הנבחרים כחברים"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
-
-#~ msgid "autozoom"
-#~ msgstr "מיקוד אוטומטי"
-
-#~ msgid "autoload tiles"
-#~ msgstr "טען משטחים אוטומטית"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "מיקוד אוטומטי: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "טען משטחים אוטומטית: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "רמת מיקוד מירבית: "
-
-#~ msgid "zoom"
-#~ msgstr "מיקוד"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
-
-#~ msgid "zoom level"
-#~ msgstr "רמת מיקוד"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n"
-
-#~ msgid "Login"
-#~ msgstr "התחברות"
-
-#~ msgid "Save and Exit"
-#~ msgstr "שמור וצא"
-
-#~ msgid "Delete Layer"
-#~ msgstr "מחק שכבה"
-
-#~ msgid "Base Server URL"
-#~ msgstr "כתובת שרת הבסיס"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>הזערה: הסיסמא נשמרת בצורה לא מוצפנת בקובץ המאפיינים.<br>הסיסמא "
-#~ "נשלחת בצורה לא מוצפנת לשרת, מקודדת בכתובת.<br><b>אל תשתמש בסיסמא בעלת ערך."
-#~ "</b></html>"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "אחד בכל זאת"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "יבוא NMEA נכשל!"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "מזג בכל זאת"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "ערכים שליליים מציינים חצי כדור מערבי\\דרומי."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?"
-
-#~ msgid "Update Data"
-#~ msgstr "עדכן נתונים"
-
-#~ msgid "Add a new layer"
-#~ msgstr "הוסף שכבה חדשה"
-
-#~ msgid "Continue anyway"
-#~ msgstr "המשך בכל זאת"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה."
-
-#~ 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] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?"
-#~ msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "אחד מהקבצים הנבחרים היה null !!!"
-
-#~ msgid "citymap"
-#~ msgstr "מפת עיר"
-
-#~ msgid "hikingmap"
-#~ msgstr "מפת צעידה"
-
-#~ msgid "map"
-#~ msgstr "מפה"
-
-#~ msgid "bicyclemap"
-#~ msgstr "מפת רכיבה"
-
-#~ msgid "football"
-#~ msgstr "כדורגל אמריקאי"
-
-#~ msgid "rugby"
-#~ msgstr "רוגבי"
-
-#~ msgid "Motor Sports"
-#~ msgstr "ספורט מוטורי"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "ערוך ספורט מוטורי"
-
-#~ msgid "intermedia"
-#~ msgstr "בינוני"
-
-#~ msgid "advance"
-#~ msgstr "מתקדמים"
-
-#~ msgid "Edit Football"
-#~ msgstr "ערוך כדורגל אמריקאי"
-
-#~ msgid "Football"
-#~ msgstr "כדורגל אמריקאי"
-
-#~ msgid "Rugby"
-#~ msgstr "רוגבי"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "ערוך רוגבי"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "צעידה אלפינית מאומצת"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "ערוך צעידה אלפינית מאומצת"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "צעידה אלפינית קשה"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "ערוך צעידה אלפינית קשה"
-
-#~ msgid "Shop"
-#~ msgstr "חנות"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "ערוך חנות משקאות"
-
-#~ msgid "Errors during Download"
-#~ msgstr "שגיאות במהלך הורדה"
-
-#~ msgid "optician"
-#~ msgstr "אופטיקאי"
-
-#~ msgid "sports"
-#~ msgstr "ספורט"
-
-#~ msgid "Edit Station"
-#~ msgstr "ערוך תחנה"
-
-#~ msgid "Station"
-#~ msgstr "תחנה"
-
-#~ msgid "Full Screen"
-#~ msgstr "מסך מלא"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "הורד מידע על התוסף מאתר אחד ({0})"
-#~ msgstr[1] "הורד מידע על התוסף מ{0} אתרים"
-
-#~ msgid "Accomodation"
-#~ msgstr "לינה"
-
-#~ msgid "Edit Airport"
-#~ msgstr "ערוך שדה תעופה"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "החלף בחירה עם נתוני משתמש"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "ביטול מחיקת דרך..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "בודק האם נקודה {0} נעלמה..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "ביטול מחיקת יחס..."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "כן, בטל גם את המחיקה שלהם"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "לא, בטל את הפעולה"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "בטל מחיקת נקודות נוספות?"
-
-#~ msgid "Keep mine"
-#~ msgstr "שמור את שלי"
-
-#~ msgid "Update Selection"
-#~ msgstr "עדכן בחירה"
-
-#~ msgid "Update failed"
-#~ msgstr "עדכון נכשל"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "ערך מוחזר לא צפוי. התקבל {0}"
-
-#~ msgid "Delete mine"
-#~ msgstr "מחק את שלי"
-
-#~ msgid "Selection too big"
-#~ msgstr "בחירה גדולה מידי"
-
-#~ msgid "Uploading"
-#~ msgstr "העלאה"
-
-#~ msgid "Conflict detected"
-#~ msgstr "התגלתה התנגשות"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>רחוב אבג</b>-'רחוב' ו'אבג' בכל מפתח או שם."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"רחוב אבג\"</b>-'רחוב אבג' בכל מפתח או שם."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:אבג</b>-'אבג' איפשהו בשם."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b>-מפתח 'type' עם הערך 'route' במדוייק."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b>-מפתח 'type' עם כל ערך. נסה גם <b>*=value</b>, <b>type=</b>, "
-#~ "<b>*=*</b>, <b>*=</b>"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:אבג</b>-ללא 'אבג' בשם."
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "סנכרן רק את {0} {1}"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "העלאה ל-API של OSM נכשלה"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "השגיאות הבאות הרעו במהלך הורדה המונית:"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "יחס מתנגש"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "פתור התנגשות התווית {0} ב-{1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "פתור התנגשויות רשימת הנקודות בדרך {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "פתור התנגשות גירסאות ב-{0} {1}"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "לא נמצאה גירסה מוקדמת. ההיסטוריה ריקה."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "אף דרך \"to\" לא נמצאה."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "יותר מ-\"to\" אחד נמצא."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "יותר מ-\"via\" אחד נמצא."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "אף דרך \"from\" לא נמצאה."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- הגירסה שרצה היא {0}"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "הפריט {0} לא נמצא ברשימה"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "העלה את האלמנט הנבחר מקום אחד"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "העלה את האלמנטים הנבחרים מקום אחד"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "נא לבחור לפחות נקודה, דרך או יחס אחד. רק לאלמנטים שכבר הועלו יש היסטוריה."
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr "העתק את האלמנטים הנבחרים שלי לסוף רשימת האלמנטים הממוזגים"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "העתק את האלמנטים הנבחרים שלהם לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
-#~ "הממוזגים"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "העתק את האלמנטים הנבחרים שלי אחרי האלמנט הנבחר הראשון ברשימת האלמנטים "
-#~ "הממוזגים"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "העתק את האלמנטים הנבחרים שלי לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
-#~ "הממוזגים"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr "העתק את האלמנט הנבחר שלהם לתחילת רשימת האלמנטים הממוזגים"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "אינדקס טור לא צפוי. התקבל {0}"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "הקפה את הרשימה הנוכחית של אלמנטים ממוזגים"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
-
-#~ msgid ">"
-#~ msgstr "<"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "החל פתרון חלקי"
-
-#~ msgid "Move Up"
-#~ msgstr "העלה"
-
-#~ msgid "y from"
-#~ msgstr "y התחלה"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "שגיאה בהתקשרות עם השרת."
-
-#~ msgid "x from"
-#~ msgstr "x התחלה"
-
-#~ msgid "Move Down"
-#~ msgstr "הורד"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "עורך יחסים: {0}"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת."
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "אורך ערך התוית \"{0}\" על פרימיטיב {1} חורג מאורך מקסימלי אפשרי {2}. אורך "
-#~ "הערך הוא {3}."
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr "הזהרה: מגביל אוטומטית את ערך התוית \"{0}\" על גבי פרימיטיב מחוק {1}"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>אין אפשרות לקרוא קובץ''{0}''.<br>הודעת שגיאה: <br>{1}</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה  מחדש לדפי המידע "
-#~ "או ההיסטוריה תיכשל. URL בסיס של ה-API הוא: ''{0}''"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "התנגשות במהלך ההורדה"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "אין סט שינויים פתוח כרגע"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "סגור את סט השינויים הנוכחי ..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "סגור את סט השינויים הנוכחי"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "ערך מוחזר לא צפוי. התקבל {0}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "לא נמצאה גירסה מוקדמת. ההיסטוריה ריקה."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "אינדקס טור לא צפוי. התקבל {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "לא ניתן לקרוא את \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
-
-#~ msgid "Download Object..."
-#~ msgstr "הורד עצם..."
-
-#~ msgid "Download Object"
-#~ msgstr "הורד עצם"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "תצוגת מסך מלא"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" אינו סגור ולכן אין אפשרות לצרפו."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "עבור למסך מלא"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "חבר שטחים: הסר דרכים קצרות"
-
-#~ msgid "Closed Way"
-#~ msgstr "דרך סגורה"
+#~ msgid "Change values?"
+#~ msgstr "לשנות ערכים?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "צירוף תגיות לא רגיל"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "שמור את הקואורדינטות שלהם"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "שמור את הקואורדינטות שלי"
Index: applications/editors/josm/i18n/po/id.po
===================================================================
--- applications/editors/josm/i18n/po/id.po	(revision 26529)
+++ applications/editors/josm/i18n/po/id.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-21 15:31+0000\n"
 "Last-Translator: Vasanthi <Unknown>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:43+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:41+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Panduan"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Mengabaikan dokumen URL yang cacat: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Peringatan"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" tidak menerima nama file atau URL file"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Mengabaikan dokumen URL yang cacat: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "ul>Info lebih lanjut:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Keluar JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Lanjutkan, tetap mencoba"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -391,6 +392,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -417,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -423,7 +424,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -431,5 +433,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -642,5 +644,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -892,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -899,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1081,6 +1083,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1234,5 +1236,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1461,6 +1463,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2133,5 +2135,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2449,7 +2451,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Download data"
@@ -2708,7 +2710,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Mengabaikan pengecualian karena download telah dibatalkan. Pengecualian: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2834,10 +2835,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3011,5 +3012,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3624,6 +3625,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Data mencurigakan ditemukan. Upload?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3673,40 +3674,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Hapus \"{0}\" untuk node ''{1}''"
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
+msgid "Set {0}={1} for node ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
-#, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3829,4 +3830,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Konfirmasi penghapusan"
@@ -4125,6 +4127,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4161,5 +4163,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4263,5 +4265,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4362,5 +4364,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4379,8 +4381,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4520,50 +4522,64 @@
 msgstr "WGS84 Geographic"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Zona Lambert 4 (Perancis)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Zona Lambert CC"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Zona Lambert CC9 (Perancis)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Merkator"
@@ -4588,80 +4604,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polandia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Zona PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polandia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "Zona PUWG 2000 {0} (Polandia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grid Swiss (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Latvia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Zona UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Utara"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Selatan"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Perancis (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4878,45 +4914,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5183,5 +5219,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5206,5 +5242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5215,5 +5251,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5619,5 +5655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5683,5 +5719,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "Jalan Tol"
@@ -5689,5 +5725,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5695,10 +5731,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "Jalur Air"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "penggunaan lahan"
@@ -5708,5 +5744,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5719,5 +5755,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5729,5 +5765,5 @@
 msgstr "transportasi umum"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6080,5 +6116,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6187,4 +6223,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6282,5 +6319,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6323,5 +6360,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6607,6 +6644,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6834,10 +6871,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Simpan koordinat saya"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Simpan korrdinat mereka"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6893,6 +6930,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6914,6 +6951,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7299,5 +7336,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7534,5 +7571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7746,6 +7783,36 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
 msgstr "tidak diketahui"
 
@@ -8010,5 +8077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8028,5 +8095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8043,5 +8110,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -8049,5 +8116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -8090,5 +8157,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8096,5 +8163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8286,5 +8353,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8384,5 +8451,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "User/Pemakai"
@@ -9376,5 +9442,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9556,5 +9622,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9697,4 +9763,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9706,4 +9773,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9966,9 +10039,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9977,13 +10050,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9996,18 +10069,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Gantikan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10016,5 +10090,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10024,5 +10098,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10031,27 +10105,31 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10060,62 +10138,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Posisi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10178,8 +10256,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10202,5 +10282,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10530,9 +10610,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10572,10 +10647,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10852,37 +10921,4 @@
 msgstr "Tipe"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "tidak diketahui"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10998,20 +11034,20 @@
 msgstr "Koordinat"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Riwayat untuk node {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -11103,5 +11139,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11643,8 +11679,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12044,4 +12080,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12067,11 +12104,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12147,38 +12177,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Pilih sebuah warna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nama: {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12189,9 +12219,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12199,26 +12229,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Panjang"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Panjang: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12227,8 +12257,8 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12237,12 +12267,12 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12251,10 +12281,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12262,78 +12292,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Download dari OSM sepanjang track ini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Download semua sejauh:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12342,11 +12372,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12354,6 +12384,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12361,27 +12391,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12391,29 +12421,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12517,5 +12547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12525,57 +12555,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13102,10 +13140,10 @@
 msgstr "JPEG images (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13113,5 +13151,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13120,41 +13158,41 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13178,13 +13216,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr ""
@@ -14118,82 +14156,82 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
+msgid "Draw Direction Arrows"
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
+msgid "Only on the head of a way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
-msgid "Draw Direction Arrows"
-msgstr ""
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
-msgid "Only on the head of a way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14201,15 +14239,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
+msgid "Use global settings."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14220,47 +14294,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+msgid "Force lines if no segments imported."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
+msgid "Draw large GPS points."
+msgstr ""
+
+#. hdopCircleGpsPoints
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
-msgid "Force lines if no segments imported."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
-msgid "Draw large GPS points."
-msgstr ""
-
-#. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14268,5 +14334,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14290,5 +14356,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14331,5 +14397,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14343,38 +14409,18 @@
 msgstr "Pejalan Kaki"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14383,10 +14429,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14394,35 +14440,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14430,14 +14476,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr ""
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14445,13 +14491,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14459,27 +14505,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15141,5 +15205,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15231,5 +15295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr ""
@@ -15506,5 +15570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15890,5 +15954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15917,9 +15981,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16195,6 +16259,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16517,5 +16581,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16727,5 +16791,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17113,4 +17177,9 @@
 msgstr "Simpan user dan password (unencrypted)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17902,4 +17971,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18012,4 +18083,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18573,5 +18658,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34877,4 +34962,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34891,6 +34977,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34909,15 +34995,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "nama jalan singkat"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "tag satu arah pada sebuah node"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "tag jembatan pada sebuah node"
@@ -34928,12 +35014,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "tag jalan raya yang salah pada sebuah node"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "jalan raya yang tidak bernama dan tidak terklasifikasi"
@@ -34942,16 +35028,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "jalan raya tanpa referensi"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "tipe jalan raya sementara"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "nama kunci yang salah eja"
@@ -34961,10 +35047,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr ""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -34973,10 +35059,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr ""
@@ -34985,34 +35071,43 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr ""
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr ""
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "nama jalan yang mengandung ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr ""
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr ""
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
 msgstr ""
 
@@ -35118,118 +35213,128 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "MSR Maps Topo"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "MSR Maps Urban"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italy"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (France)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA Spain"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Estonia Multi (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Denmark)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Denmark)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Pangasinan (Phillipines HiRes)"
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
+msgstr ""
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
@@ -35473,6 +35578,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Upload dibatalkan"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35574,9 +35679,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35594,23 +35699,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr "Simpan pengaturan"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35618,26 +35753,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informasi"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35645,5 +35808,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35754,9 +35917,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35855,17 +36018,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36496,28 +36676,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM berhenti bekerja agar perubahan dapat dilihat."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36635,6 +36822,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37516,5 +37703,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37522,17 +37709,17 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr ""
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+msgid "Draw lines between points for this layer."
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr ""
@@ -37684,5 +37871,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37690,10 +37877,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37702,5 +37889,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37709,6 +37896,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37717,9 +37904,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37878,71 +38065,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37950,32 +38145,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38010,6 +38199,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38140,30 +38329,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38849,5 +39051,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38864,5 +39066,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39590,17 +39792,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39614,36 +39816,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40265,5 +40463,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41231,4 +41429,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41448,6 +41663,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41694,5 +41909,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42263,5 +42478,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42650,32 +42865,22 @@
 msgstr ""
 
-#~ msgid "Save and Exit"
-#~ msgstr "Simpan dan Keluar"
-
 #~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Tidak dapat menyamakan link yang dimasukan atau id pada layanan yang "
-#~ "terpilih. Mohon coba kembali."
-
-#~ msgid "black"
-#~ msgstr "hitam"
-
-#~ msgid "brown"
-#~ msgstr "coklat"
-
-#~ msgid "red"
-#~ msgstr "merah"
-
-#~ msgid "blue"
-#~ msgstr "biru"
-
-#~ msgid "gray"
-#~ msgstr "abu-abu"
-
-#~ msgid "white"
-#~ msgstr "putih"
-
-#~ msgid "parking_lot"
-#~ msgstr "lapangan_parkir"
+#~ "Mengabaikan pengecualian karena download telah dibatalkan. Pengecualian: "
+#~ "{0}"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Data mencurigakan ditemukan. Upload?"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Simpan koordinat saya"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Simpan korrdinat mereka"
+
+#~ msgid "unkown"
+#~ msgstr "tidak diketahui"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Upload dibatalkan"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 26529)
+++ applications/editors/josm/i18n/po/is.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2010-11-27 04:37+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:33+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:34+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Hjálp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Aðvörun"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -135,13 +136,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -161,7 +162,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -171,6 +172,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,5 +202,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -379,6 +380,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -405,5 +406,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -411,7 +412,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -419,5 +421,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -627,5 +629,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -875,5 +877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -882,5 +884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1061,6 +1063,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1211,5 +1213,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1425,6 +1427,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr ""
@@ -2063,5 +2065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2369,7 +2371,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr ""
@@ -2620,5 +2622,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2744,10 +2746,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2906,5 +2908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3467,5 +3469,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3516,40 +3518,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Setti {0}={1} á hnút „{2}“"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3672,4 +3674,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3966,6 +3969,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4002,5 +4005,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4104,5 +4107,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4204,5 +4207,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4221,8 +4224,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4362,50 +4365,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4430,80 +4447,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4721,45 +4758,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5026,5 +5063,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5049,5 +5086,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5058,5 +5095,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5462,5 +5499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5526,5 +5563,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr ""
@@ -5532,5 +5569,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5538,10 +5575,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr ""
@@ -5551,5 +5588,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5563,5 +5600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5574,5 +5611,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5924,5 +5961,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6031,4 +6068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6127,5 +6165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6168,5 +6206,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6453,6 +6491,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6680,9 +6718,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr ""
 
@@ -6739,6 +6777,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6760,6 +6798,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7146,5 +7184,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7381,5 +7419,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7593,7 +7631,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "óskilgreint"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7857,5 +7925,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7875,5 +7943,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7890,5 +7958,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7896,5 +7964,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -7937,5 +8005,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7943,5 +8011,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8135,5 +8203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8233,5 +8301,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr ""
@@ -9225,5 +9292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9405,5 +9472,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9546,4 +9613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9555,4 +9623,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9815,9 +9889,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9826,13 +9900,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9845,18 +9919,19 @@
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Breyta eigindum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9865,5 +9940,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9873,5 +9948,5 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9880,27 +9955,31 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Veldu gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Veldu hluti til að breyta eigindum þeirra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Eigindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Eigindi valdra hluta."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9909,62 +9988,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Eigindi & vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10028,8 +10107,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10052,5 +10133,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10380,9 +10461,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10422,10 +10498,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10701,37 +10771,4 @@
 msgstr "Gerð"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "óskilgreint"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10847,20 +10884,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -10952,5 +10989,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11488,8 +11525,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11895,4 +11932,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11918,11 +11956,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -11999,38 +12030,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Sérsníða liti"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Veldu lit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12041,9 +12072,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12051,26 +12082,26 @@
 msgstr "Lýsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Tímaspan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Lengd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12079,8 +12110,8 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12089,12 +12120,12 @@
 msgstr[1] "{0} punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12103,10 +12134,10 @@
 msgstr[1] "{0} ferlar, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12114,78 +12145,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12194,11 +12225,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12206,6 +12237,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12213,27 +12244,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Flytja inn hljóð"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12243,29 +12274,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Flytja inn myndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12369,5 +12400,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12377,57 +12408,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -12950,10 +12989,10 @@
 msgstr "JPEG myndir (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps punktur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -12961,5 +13000,5 @@
 msgstr[1] "punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -12968,41 +13007,41 @@
 msgstr[1] "{0} samanstendur af {1} punktum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
-#, java-format
-msgid "Audio synchronized at point {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13026,13 +13065,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr ""
@@ -13966,82 +14005,82 @@
 msgstr "Litir"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
+msgid "Draw Direction Arrows"
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
+msgid "Only on the head of a way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
+msgid "Draw oneway arrows."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+msgid "Draw segment order numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+msgid "Draw boundaries of downloaded data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+msgid "Draw virtual nodes in select mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+msgid "Draw inactive layers in other color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Smooth map graphics (antialiasing)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
-msgid "Draw Direction Arrows"
-msgstr ""
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
-msgid "Only on the head of a way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
-msgid "Draw oneway arrows."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
-msgid "Draw segment order numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-msgid "Draw boundaries of downloaded data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
-msgid "Draw virtual nodes in select mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-msgid "Draw inactive layers in other color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-msgid "Smooth map graphics (antialiasing)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14049,15 +14088,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM gögn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Aldrei"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
+msgid "Use global settings."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14068,47 +14143,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Fyrir staðværar skrár"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Aldrei"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Teikna stóra GPS punkta."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hraði (rauður = hægari, grænn = hraðari)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14116,5 +14183,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14138,5 +14205,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14179,5 +14246,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14191,38 +14258,18 @@
 msgstr "Fótgangandi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14231,10 +14278,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Teikna línu á milli GPS punkta"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14244,10 +14291,10 @@
 "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Hámarkslengd lína fyrir staðværar skrár (í metrum)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14256,25 +14303,25 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Hámarkslengt milli punkta (í metrum)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14282,14 +14329,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr ""
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14297,13 +14344,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14311,27 +14358,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -14992,5 +15057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15082,5 +15147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Endurstilla"
@@ -15357,5 +15422,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15741,5 +15806,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15768,9 +15833,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16046,6 +16111,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16368,5 +16433,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16578,5 +16643,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -16965,4 +17030,9 @@
 msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17754,4 +17824,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -17871,4 +17943,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18432,5 +18518,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34731,4 +34817,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34745,6 +34832,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34763,15 +34850,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr ""
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr ""
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr ""
@@ -34782,12 +34869,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr ""
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr ""
@@ -34796,16 +34883,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr ""
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr ""
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr ""
@@ -34815,10 +34902,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr ""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -34827,10 +34914,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr ""
@@ -34839,34 +34926,43 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr ""
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr ""
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr ""
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "vensl án týpu"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "nafnlaus veitingastaður"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
 msgstr ""
 
@@ -34972,117 +35068,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr ""
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr ""
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35327,5 +35433,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr ""
 
@@ -35428,9 +35534,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35448,23 +35554,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35472,26 +35608,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Upplýsingar"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35499,5 +35663,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35608,9 +35772,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35709,17 +35873,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36350,28 +36531,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36489,6 +36677,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37370,5 +37558,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37376,17 +37564,17 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+msgid "Draw lines between points for this layer."
+msgstr ""
+
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr ""
@@ -37538,5 +37726,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37544,10 +37732,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37556,5 +37744,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37563,6 +37751,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37571,9 +37759,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37732,71 +37920,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37804,32 +38000,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -37864,6 +38054,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -37994,30 +38184,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38703,5 +38906,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38718,5 +38921,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39444,17 +39647,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39468,36 +39671,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40119,5 +40318,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41085,4 +41284,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41302,6 +41518,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41548,5 +41764,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42117,5 +42333,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42501,1010 +42717,4 @@
 msgstr ""
 
-#~ msgid "Incorrect password or username."
-#~ msgstr "Rangt lykilorð eða notandanafn"
-
-#~ msgid "Aborting..."
-#~ msgstr "Hætti við..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Sláðu inn lykilorð"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Viðbótin „{0}“ fannst ekki."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Óvistaðar breytingar"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
-
-#~ msgid "to"
-#~ msgstr "til"
-
-#~ msgid "y from"
-#~ msgstr "y frá"
-
-#~ msgid "x from"
-#~ msgstr "x frá"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Óútfært."
-
-#~ msgid "Length: "
-#~ msgstr "Lengd: "
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Gat ekki skrifað bókamerki."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Gat ekki lesið bókamerki."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM lykilorð"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Útgáfa {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Uppfæra eftirfarandi viðbætur:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Nafn milliþjóns"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Stillingar milliþjóns"
-
-#~ msgid "Anonymous"
-#~ msgstr "Nafnlaust"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Nota milliþjón"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Port á milliþjóni"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Notandanafn á milliþjóni"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Lykilorð á milliþjóni"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
-#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
-
-#~ msgid "File not found"
-#~ msgstr "Skrá fannst ekki"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "V"
-
-#~ msgid "E"
-#~ msgstr "A"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Opna í vafra"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM vefhjálp"
-
-#~ msgid "Downloading..."
-#~ msgstr "Sæki..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Óþekkt skráarending"
-
-#~ msgid "File could not be found."
-#~ msgstr "Skrá fannst ekki."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Það komu upp vandamál með eftirfarandi viðbætur:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Uppfæra viðbætur"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
-#~ "reyna síðar."
-
-#~ msgid "Preparing..."
-#~ msgstr "Undirbý..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Hleð upp gögnum..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Óþekkt útgáfa"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Undirbý gögn..."
-
-#~ msgid "Edit new relation"
-#~ msgstr "Breyta venslum"
-
-#~ msgid "Create new relation"
-#~ msgstr "Skapa ný vensl"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Breyta venslum #{0}"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Hala niður öllum nóðum og vegum í þessum venslum"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Fjarlægja val úr venslunum"
-
-#~ msgid "name"
-#~ msgstr "nafn"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Villa: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Viðvörun: {0}"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Hlaða upp breytingum?"
-
-#~ msgid "Uploading data"
-#~ msgstr "Hleð upp gögnum"
-
-#~ msgid "Email"
-#~ msgstr "Netfang"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Gat ekki lesið frá veffang: \"{0}\""
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Sláðu inn leitarstreng"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Aðeins einn hnútur valinn"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Sláðu inn hnit fyrir nýja hnútinn."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Nota tugabrotsgráður."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Vertu viss um að láta eftirfarandi upplýsingar fylgja:"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Opna breytingasett..."
-
-#~ msgid "Cycleway"
-#~ msgstr "Hjólastígur"
-
-#~ msgid "Footway"
-#~ msgstr "Göngustígur"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Það eru óvistaðar breytingar. Eyða laginu þrátt fyrir það?"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Eyða völdu lagi."
-
-#~ msgid "Delete Layer"
-#~ msgstr "Eyða laginu"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Bæta völdum hlutum við venslin"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Sláðu inn leitarstreng"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Ógildur hlutur með kenni=0"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Stök: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Árekstrar: {0}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Leysa {0} árekstra í {1} hlutum"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} hlutur hefur árekstra:"
-#~ msgstr[1] "{0} hlutir hafa árekstra:"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Vensl rekast á"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Leysa árekstra"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Skipanasaga: {0}"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Sláðu inn nafn fyrir staðsetningu."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Þjónn styður ekki breytingasett"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Velja, færa og snúa hlutum"
-
-#~ msgid "Do not show again"
-#~ msgstr "Ekki sýna þessi skilaboð aftur"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Hámarkshæð (í metrum)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Hámarksbreidd (í metrum)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Hámarkslengd (í metrum)"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir "
-#~ "það?"
-
-#~ msgid "Edit Properties"
+#~ msgid "Change values?"
 #~ msgstr "Breyta eigindum"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Valið \"{0}\" er notað af venslunum \"{1} með hlutverkið {2}.\n"
-#~ "Eyða úr venslunum?"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Óþekkt hlutverk \"{0}\"."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?"
-
-#~ msgid "gps track description"
-#~ msgstr "lýsing á gps ferli"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Upphala til OSM..."
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Breyti vínbúð"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Óvænt undantekning átti sér stað\n"
-#~ "\n"
-#~ "þetta er alltaf forritunarvilla. Ef þú ert að keyra nýjustu \n"
-#~ "útgáfuna af JOSM, vinsamlegast sendu þá inn villumeldinguna."
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Vinsamlegast sendu meldinguna á {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Sendu með upplýsingar um það hvað þú gerðir sem framkallaði villuna (eins "
-#~ "nákvæmt og hægt er)"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Reyndu að uppfæra í nýjustu útgáfuna af JOSM og allar viðbætur áður en þú "
-#~ "tilkynnir um villu."
-
-#~ msgid "Commit comment"
-#~ msgstr "Staðfesta umsögn"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Atriði merkt \"{0}\" vantar"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Ert þú viss um að þú viljir eyða öllu laginu?"
-
-#~ msgid "sports"
-#~ msgstr "íþróttir"
-
-#~ msgid "Update Data"
-#~ msgstr "Uppfæra gögn"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Virki uppfærðar viðbætur"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Upphala öllum breytingum á OSM þjóninn."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Illa-formað kenni á hnút"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
-#~ "<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) "
-#~ "gætu verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Valdir hnútar eru stök í mismundandi venslum. Viltu sameina þá þrátt "
-#~ "fyrir það?"
-
-#~ msgid "Edit Football"
-#~ msgstr "Breyti Amerískum fótbolta"
-
-#~ msgid "Football"
-#~ msgstr "Amerískur fótbolti"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Vista og hætta"
-
-#~ msgid "Sync clock"
-#~ msgstr "Samstilla klukkur"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Veldu fyrst bókmerki"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Tómt gildi eyðir lyklinum"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Tómur bendill, hugsanvega vantar einhver eigindi."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Eigindi (tómt gildi eyðir eigindunum)"
-
-#~ msgid "Add Selected"
-#~ msgstr "Bæta við vali"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Fjarlægja val"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Sláðu inn hnitin fyrst"
-
-#~ msgid "zoom"
-#~ msgstr "þysja"
-
-#~ msgid "near"
-#~ msgstr "nálægt"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Þysja: Notið músarhjól eða tvísmellið. Færa kort: Hægrismellið og hreyfið "
-#~ "músina. Velja: Smellið"
-
-#~ msgid "Download Area"
-#~ msgstr "Niðurhalssvæði"
-
-#~ msgid "zoom level"
-#~ msgstr "Þysjun á lag"
-
-#~ msgid "optician"
-#~ msgstr "Sjóntækjasmiður"
-
-#~ msgid "Accomodation"
-#~ msgstr "Gisting"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Sýna stillingar fyrir ritilinn."
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Nær aftur í gögnin sem sjást í núverandi lagi frá þjóninum og uppfærir "
-#~ "þau."
-
-#~ msgid "History of Element"
-#~ msgstr "Breytingaskrá hluts"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Sýna sögu OSM hnúta eða vega."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Leysa breytingarárekstra"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst."
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Laga valdar villur."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Hunsa viðkomandi villu við næstu staðreyningu"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Athuga núverandi val eða öll gögn í laginu."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Breytingarárekstrar."
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Opna OpenStreetBugs gluggann og virkja sjálfvirkt niðurhal paddna."
-
-#~ msgid "Create a new map."
-#~ msgstr "Skapa nýtt kort."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lög: {0}"
-
-#~ msgid "Data Layer"
-#~ msgstr "Gagnalag"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Gat ekki lesið vörpun úr stillingum. Nota EPSG:4326"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Gögnin stóðust ekki athugun. Upphala þrátt fyrir það?"
-
-#~ msgid "Shop"
-#~ msgstr "Búð"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Ekki vista breytingar"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Leiðrétta stöðu WMS lagsins sem nú er valið"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Leiðrétta stöðu WMS lagsins"
-
-#~ msgid "Occupied By"
-#~ msgstr "Gengt af"
-
-#~ msgid "Timespan: "
-#~ msgstr "Tímaspan: "
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Sameina valið lag laginu sem er fyrir neðan það í valllistanum."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Hámarkslengd milli punkta í metrum sem lína verður teiknuð á milli. Settu "
-#~ "þetta á „-1“ til að teikna allar línur."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Sé þessi möguleiki valin mun ferilinn vera sýnilegur öllum á "
-#~ "openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Sýnilegur öllum"
-
-#~ msgid "Charge"
-#~ msgstr "Gjaldtaka"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Fjöldi víra"
-
-#~ msgid "Bridleway"
-#~ msgstr "Reiðstígur"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Breyti flugvelli"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Breyti upplýsingamiðstöð"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Vatnspunktar"
-
-#~ msgid "Board Type"
-#~ msgstr "Viðfangsefni skiltisins"
-
-#~ msgid "Map Type"
-#~ msgstr "Gerð korts"
-
-#~ msgid "bicyclemap"
-#~ msgstr "hjólakort"
-
-#~ msgid "citymap"
-#~ msgstr "borgarkort"
-
-#~ msgid "hikingmap"
-#~ msgstr "göngukort"
-
-#~ msgid "map"
-#~ msgstr "kort"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Gat ekki endurnefnt skránna „{0}“."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Opna myndir með AgPifoJ..."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Gagnabankar"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Gam</b> - „Gam“ kemur ekki fyrir í nafninu."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Gam</b> - „Gam“ kemur fyrir í nafninu."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Gamla Hringbraut</b> - „Gamla“ og „Hringbraut“ í einhverjum lykli og "
-#~ "gildi."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Gamla Hringbraut\"</b> - „Gamla Hringbraut“ í einhverjum lykli og "
-#~ "gildi."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - Hlutur með gefið kenni (e. „id“)"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr ""
-#~ "<b>nodes:</b>... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun."
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Notaðu <b>\"</b> til að eyða tvíræðni, t.d. ef lykill eða gildi "
-#~ "inniheldur „:“ eða „ “"
-
-#~ msgid "CS"
-#~ msgstr "stafsetursnæmt"
-
-#~ msgid "CI"
-#~ msgstr "stafsetursónæmt"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "{0}"
-
-#~ msgid "Full Screen"
-#~ msgstr "Fylla skjá"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr "Valið „{0}“ er notað af venslunum „{1}“."
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} búið. Hleð upp: {4}: {5} (id: {6})"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Gagnvirkt kort"
-
-#~ msgid "Base Server URL"
-#~ msgstr "Slóð OSM þjóns"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Fara í fullskjáham"
-
-#~ msgid "Update Selection"
-#~ msgstr "Uppfæra val"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Sýna breytingasögu valdra hluta"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Breytingaskrá: {0} {1}"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Næ í breytingaskrá fyrir {0} með kennið {1}"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki "
-#~ "lykilorðið."
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Notandanafn (eða netfang) á OSM þjóninum."
-
-#~ msgid "Login"
-#~ msgstr "Innskrá"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM notandanafn (netfang)"
-
-#~ msgid "Move Up"
-#~ msgstr "Færa upp"
-
-#~ msgid "Move Down"
-#~ msgstr "Færa niður"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Fjarlægja valda meðlimi úr venslunum"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Raða völdum meðlimum eða öllum listanum"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Stök: {0} (tengd: {1})"
-
-#~ msgid "linked"
-#~ msgstr "tengd"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Stillingar fyrir WMS viðbótina"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Hámarkslengd (í metrum) á milli punkta áður en hætt er að tekna línur á "
-#~ "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Útgáfa <strong>{0}</strong> búin til <strong>{1}</strong> af "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - lykilinn „type“ með gildið „route“."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - lykillinn „type“ með hvaða gildi sem er. Prófaðu einnig "
-#~ "<b>*=gildi</b>, <b>type=</b>, <b>*=*</b> og <b>*=</b>"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Allar innsettar viðbætur eru af nýjustu útgáfu."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Hala niður nýjum viðbótum"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Hala niður eftirfarand viðbótum?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Hala niður viðbótum"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Ekki tókst að virkja nýju viðbæturnar. Tryggðu að JOSM hafi réttndi til "
-#~ "að yfirskrifa núverandi viðbætur."
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "Náð var í {0} viðbót. Vinsamlegast endurræstu JOSM til að nota nýju "
-#~ "viðbótina."
-#~ msgstr[1] ""
-#~ "Náð var í {0} viðbætur. Vinsamlegast endurræstu JOSM til að nota nýju "
-#~ "viðbæturnar."
-
-#~ msgid "Download List"
-#~ msgstr "Hala niður uppfærðum lista"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Halaði niður lista yfir viðbætur frá {0} þjóni"
-#~ msgstr[1] "Halaði niður lista yfir viðbætur frá {0} þjónum"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Stilla viðbótarþjóna..."
-
-#~ msgid "Copy Default"
-#~ msgstr "Afrita sjálfgefið val á minn lista"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Veldu hlut til að afrita fyrst."
-
-#~ msgid "football"
-#~ msgstr "fótbolti"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr "Engin gögn til að uppfæra. Þú þarft að niðurhala gögnum fyrst."
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Eyða völdum töggum"
-
-#~ msgid "No data imported."
-#~ msgstr "Ekki var náð í nein gögn"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Óþekkt útgáfa: {0}"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Fyrri punktur"
-
-#~ msgid "Play next marker."
-#~ msgstr "Spila næsta punkt."
-
-#~ msgid "Next Marker"
-#~ msgstr "Næsti punktur"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} samanstendur af {1} feril"
-#~ msgstr[1] "{0} samanstendur af {1} ferlum"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sameina þá"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Sýna/Fela texta og táknmyndir"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Eyði lagi {0} af {1}"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
-
-#~ msgid "Delete all"
-#~ msgstr "Eyða öllum lögunum"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Veldu minnst tvo hnúta til að sameina."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "senda allar breytingarnar í einu á þjónin"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Bæta við nýju lagi"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Þú færðir meira en {0} hluti. Óreyndir notendur færa oft marga hluti "
-#~ "fyrir slysni.\n"
-#~ "Ert þú viss um að þú viljir færa þessa hluti?"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En "
-#~ "ef ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var"
-
-#~ msgid "Close current changeset"
-#~ msgstr "Loka núverandi breytingarsetti"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Loka núverandi breytingarsetti ..."
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "Hlaða upp sem nýju breytingarsetti eða bæta við eldra?"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Opna nýtt breytingarsett og loka því strax"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Opna nýtt breytingarsett og skilja það eftir opið"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr "Nota opið breytingarsett #{0} og loka því"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} hlut verður breytt:"
-#~ msgstr[1] "{0} hlutum verður breytt:"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé "
-#~ "að bæta við frekari breytingum síðar meir"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Breytingunni verður bætt við breytingarsett #{0} og því lokað eftir að "
-#~ "breytingunni hefur verið upphlaðið"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "Nýtt breytingarsett verður búið til og því lokað eftir að breytingunni "
-#~ "hefur verið upphlaðið"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Breytingunni verður bætt við breytingarsett #{0} og það skilið eftir opið "
-#~ "svo hægt sé að bæta við frekari breytingum síðar meir"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Endurhlaða vallistann"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Vista og eyða"
-
-#~ 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] ""
-#~ "Þú ert með {0} veg valinn. Ertu viss um að þú viljir einfalda hann?"
-#~ msgstr[1] ""
-#~ "Þú ert með {0} vegi valda. Ertu viss um að þú viljir einfalda þá alla?"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Opna nýtt breytingarsett"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Nota opið breytingarsett"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Upphala öllum breytingunum í einni fyrirspurn"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Bæta gögnunum við breytingarsett sem er þegar opið á þjóninum"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“."
-#~ "<br>Eyða úr venslunum?</html>"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Sameina valda hluti öðru lagi en þeir eru í núna"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Upphal <strong>mistókst</strong>.<br>{0}</html>"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Sýna breytingasögu valdra hluta"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
-
-#~ msgid "Travel"
-#~ msgstr "Ferðamennska"
-
-#~ msgid "Man-Made"
-#~ msgstr "Mannvirki"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Mörg stök benda á sama hlutinn"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Í þessum venslum eru þegar eitt eða fleiri stök sem benda á "
-#~ "hlutinn<br>„{0}“.<br><br>Ertu viss um að þú viljir bæta við öðru staki "
-#~ "sem bendir á þennan hlut?</html>"
-
-#~ msgid "create new objects"
-#~ msgstr "búa til nýja hluti"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Velja hluti sem þessi notandi hefur vistað"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Bæta völdum stökum á vallistann"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Undirvenslunum<br>{0}<br>hefur verið eytt á þjóninum, ekki er hægt "
-#~ "að ná í þau."
-
-#~ msgid "More details"
-#~ msgstr "Frekari upplýsingar"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Aðeins er hægt að velja tvo hnúta"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Neikvæð gildi tákna vestur- og suðurhvel."
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} hlutur var fjarlægður úr gögnunum þínum því honum hefur verið eytt á "
-#~ "þjóninum."
-#~ msgstr[1] ""
-#~ "{0} hlutir voru fjarlægðir úr gögnunum þínum því þeim hafði verið eytt á "
-#~ "þjóninum."
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Undirvenslunum<br>{0}<br>hefur verið eytt á þjóninum, ekki er hægt "
-#~ "að ná í þau."
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 26529)
+++ applications/editors/josm/i18n/po/it.po	(revision 26530)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-28 09:21+0000\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-11 08:50+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -14,10 +14,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:46+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:43+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -32,12 +32,12 @@
 msgstr "Aiuto"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -74,10 +74,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -92,6 +92,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -115,15 +116,15 @@
 msgstr "Attenzione"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Il parametro \"downloadgps\" non accetta nomi di file o indirizzi URL di file"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -137,13 +138,13 @@
 "di JOSM.</li></ul>Maggiori informazioni:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Esci da JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Continua, prova comunque"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -163,7 +164,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -173,6 +174,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -203,5 +204,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -389,6 +390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -415,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -421,7 +422,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -429,5 +431,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -637,5 +639,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1082,6 +1084,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1237,5 +1239,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1475,6 +1477,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "Indirizzo URL"
@@ -2156,5 +2158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2477,7 +2479,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Scarica dati"
@@ -2741,8 +2743,7 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"L''eccezione verrà ignorata perché lo scaricamento è stato annullato. "
-"Eccezione: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
+"Ignoro l''errore perché lo scaricamento è stato annullato. L''errore era: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2880,10 +2881,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3061,5 +3062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3686,6 +3687,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Sono stati trovati dei dati sospetti. Caricare ugualmente?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr "Sono stati trovati dei dati sospetti. Carcare ugualmente?"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3735,40 +3736,40 @@
 msgstr "Nodi modificati di {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Rimuovi \"{0}\" per il nodo ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Rimuovi \"{0}\" per il percorso ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Rimuovi \"{0}\" per la relazione ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Imposta {0}={1} per il nodo ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Imposta {0}={1} per il percorso ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Imposta {0}={1} per la relazione ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Rimuovi \"{0}\" per {1} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3899,4 +3900,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Conferma di cancellazione"
@@ -4219,9 +4221,9 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Attenzione: fallita l''inizializzazione delle preferenze.Non è stato "
-"possibile reimpostare il file delle preferenze con uno predefinito: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
+"Attenzione: è fallita l''inizializzazione delle preferenze. Impossibile "
+"ripristinare il file delle preferenze con i valori predefiniti: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4257,8 +4259,8 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Attenzione: numero di versione JOSM non previsto nel file di revisione, il "
-"valore è ''''{0}''''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
+"Attenzione: numero di versione JOSM non atteso nel file della revisione, il "
+"valore è ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4367,11 +4369,11 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM si aspettava di trovare la primitiva [{0} {1}] nell''insieme di dati, "
-"ma non c''è. Si prega di riportare questo errore al sito http://josm."
-"openstreetmap.de . Questo non è un errore critico, si può probabilmente "
-"continuare a lavorare senza problemi."
+"JOSM si aspettava di trovare la primitiva [{0} {1}] nell''insieme dei dati, "
+"ma non c''è. Si prega di segnalare questo problema su http://josm."
+"openstreetmap.de/. Questo non è un errore grave e quindi dovrebbe essere "
+"possibile continuare a lavorare senza problemi."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4477,5 +4479,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4494,8 +4496,8 @@
 msgstr "multi-poligono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4649,52 +4651,68 @@
 msgstr "WGS84 Geografico"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+"Errore: fallita l''apertura del flusso di entrata per la risorsa ''/data/"
+"{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr "Gauss-Krüger"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr "Zona GK"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Attenzione: è fallita l''apertura del flusso di entrata per la risorsa ''''/"
-"data/{0}''''. Impossibile caricare la griglia NTF<->RGF93"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+"Errore: fallita l''apertura del flusso di entrata per la risorsa ''/data/"
+"{0}''. Impossibile caricare la griglia NTF<->RGF93"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Zona di Lambert 4 (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} a {2} gradi)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Zona di Lambert CC"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Zona di Lambert CC9 (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona di Lambert (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercatore"
@@ -4723,81 +4741,101 @@
 "impostare le preferenze in modo da far corrispondere il codice ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Zona PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "Zona {0} PUWG 2000 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Sistema di coordinate svizzero (Svizzera)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Lettonia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Zona UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Nord"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Sud"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Emisfero"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Scostamento 3.000.000m est"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadalupa Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadalupa Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinica Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Riunione RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Francia (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM Sistema Geodesic"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr "GRS80"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr "WGS84"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr "Conica conforme di Lambert"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr "Svizzera Obliqua di Mercatore"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr "Trasversa di Mercatore"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -5023,45 +5061,45 @@
 msgstr "Questo controllo verifica che i multi-poligoni siano validi"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Percorso di tipo area non chiuso"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Nessun percorso esterno per il multi-poligono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Nessuno stile per il multi-poligono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Nessuno stile nella relazione di tipo multi-poligono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Lo stile del percorso interno è identico al multi-poligono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Lo stile del percorso esterno non è coerente"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Il multi-poligono non è chiuso"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Il percorso interno del multi-poligono è esterno"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Intersezione tra i percorsi dei multi-poligoni"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Nessun ruolo utile per il membro del multi-poligono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Nel multi-poligono è presente un elemento che non è un percorso"
@@ -5348,5 +5386,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5371,5 +5409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5380,5 +5418,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5807,5 +5845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5876,5 +5914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "strada"
@@ -5882,5 +5920,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5888,10 +5926,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "Corso d’acqua"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "Uso del terreno"
@@ -5901,5 +5939,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5913,5 +5951,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5924,5 +5962,5 @@
 msgstr "trasporto pubblico"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6299,5 +6337,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6409,4 +6447,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6512,5 +6551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6557,11 +6596,11 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>In alternativa si può inserire un <strong>indirizzo</strong> per un "
-"singolo tassello nel formato <i>zoomlevel/x/y</i>, es. <i>15/256/223</i>. "
-"Sono anche validi gli indirizzi nel formato <i>zoom,x,y</i> oppure <i>zoom;x;"
-"y</i>.</html>"
+"<html>In alternativa è possibile inserire un <strong>indirizzo di un singolo "
+"tassello</strong> nel formato <i>livelloingrandimento/x/y</i>, es. "
+"<i>15/256/223</i>. Sono anche validi gli indirizzi dei tasselli nel formato "
+"<i>ingrandimento,x,y</i> oppure <i>ingrandimento;x;y</i>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6857,9 +6896,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista degli elementi uniti. Questi sostituiranno gli elementi personali non "
-"appena saranno applicate le decisioni sull''unione."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
+"Lista degli elementi uniti. Sostituiranno la lista degli elementi personali "
+"non appena sarà applicata la scelta sull''unione."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -7113,9 +7152,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr "Mantieni le mie coordinate"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr "Mantieni le loro coordinate"
 
@@ -7177,6 +7216,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7198,6 +7237,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7624,5 +7663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7870,5 +7909,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -8099,6 +8138,36 @@
 msgstr "mapcss"
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
 msgstr "sconosciuto"
 
@@ -8387,5 +8456,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8406,5 +8475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8421,5 +8490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Scarica i membri incompleti delle relazioni selezionate"
@@ -8427,5 +8496,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Scarica membri incompleti"
@@ -8468,5 +8537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8474,5 +8543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8676,5 +8745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8780,5 +8849,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Utente"
@@ -9779,5 +9847,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9959,5 +10027,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -10117,4 +10185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Solo i miei changeset"
@@ -10127,4 +10196,12 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Solo i changeset dell''utente con il seguente user name"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Solo gli insiemi di modifiche che mi appartengono (disabilitato. In questo "
+"momento JOSM è in esecuzione con un utente anonimo)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10434,9 +10511,9 @@
 "L’indirizzo URL per l’interrogazione sui gruppi di modifiche non è valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10445,13 +10522,13 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Un campo vuoto cancellerà il tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10464,18 +10541,19 @@
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Cambiare i valori?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] "Modificare il valore?"
+msgstr[1] "Modificare i valori?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr "Sovrascrivi chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10486,5 +10564,5 @@
 "La nuova chiave è già utilizzata, sovrascrivere i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10494,5 +10572,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10501,27 +10579,31 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr "Aggiungere il valore?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10530,62 +10612,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Vai al wiki di OSM per la documentazione relativa all''etichetta (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Avvia il browser con la documentazione sull''oggetto selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Seleziona i membri della relazione selezionata"
@@ -10653,10 +10735,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Attenzione: eccezione ignorata perché il lavoro è stato annullato. "
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Attenzione: ignoro l''errore perché il processo è stato annullato. "
 "Eccezione: {0}"
 
@@ -10679,7 +10763,9 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Scaricamento di {0} figlio incompleto di {1} relazioni padri"
-msgstr[1] "Scaricamento di {0} figli incompleti di {1} relazioni padri"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+"Scaricamento di {0} figlio incompleto appartenente a {1} relazioni padre"
+msgstr[1] ""
+"Scaricamento di {0} figli incompleti appartenenti a {1} relazioni padre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -11049,11 +11135,4 @@
 msgstr "Ci sono stati {0} conflitti durante l''importazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Attenzione: eccezione ignorata perché il lavoro è stato annullato. "
-"Eccezione: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -11094,12 +11173,4 @@
 msgid "Load relation"
 msgstr "Carica relazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Attenzione: eccezione ignorata perché l''elaborazione è stata annullata. "
-"L''eccezione è stata: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11393,37 +11464,4 @@
 msgstr "Tipo"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "sconosciuto"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11559,20 +11597,20 @@
 msgstr "Coordinate"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Storico per il nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Storico per il percorso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Storico per la relazione {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Ricarica lo storico dal server"
@@ -11674,6 +11712,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Insieme di modifiche"
+msgid "Changeset:"
+msgstr "Insieme di modifiche:"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12290,14 +12328,14 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Una operazione di caricamento e/o salvataggio di un livello contenente "
-"modifiche<br>è stata annullata oppure è fallita.</html>"
+"<html>E'' stata annullata o è fallita una operazione di caricamento e/o "
+"salvataggio<br>di un livello contenente delle modifiche.</html>"
 msgstr[1] ""
-"<html>Delle operazioni di caricamento e/o salvataggio di {0} livelli "
-"contenenti modifiche<br>sono state annullate oppure sono fallite.</html>"
+"<html>Sono state annullate o sono fallite le operazioni di caricamento e/o "
+"salvataggio<br>di {0} livelli contenenti delle modifiche.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12752,4 +12790,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12784,13 +12823,4 @@
 "perché<br>è stata superata la dimensione massima {1} del gruppo di modifiche "
 "sul server ''''{2}''''.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Sono necessari <strong>più gruppi di modifiche</strong> per poter "
-"caricare {0} oggetti. Quale strategia si desidera utilizzare?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12871,38 +12901,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Personalizza colori"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Predefinito"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Scegli un colore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12913,9 +12943,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12923,26 +12953,26 @@
 msgstr "Descrizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Differenza temporale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Lunghezza: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12951,8 +12981,8 @@
 msgstr[1] "{0} itinerari, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12961,12 +12991,12 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12975,10 +13005,10 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12989,78 +13019,78 @@
 "vedere qui:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Scarica vicino:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "solo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "solo punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "tracciato e punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -13071,11 +13101,11 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Nessuna traccia GPX da associare con l''audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -13086,6 +13116,6 @@
 "all''inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -13095,27 +13125,27 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+msgstr "Personalizza l''aspetto del tracciato"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Crea marcatori dai punti con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nomina i punti del percorso da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importa l''audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -13128,29 +13158,29 @@
 "possibile correlarli con la traccia audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Importazione non possibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Files audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -13262,5 +13292,5 @@
 msgstr "Sono stati trovati i seguenti problemi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13273,57 +13303,65 @@
 "Modificare la proiezione o rimuovere il livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Ingrandimento automatico"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Carica automaticamente i tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr "Visualizza errori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Mostra informazioni sul tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Carica tutti i tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr "Carica tutti i tasselli con errori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Aumenta l''ingrandimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Diminuisci l''ingrandimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Blocca alla dimensione del tassello"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Svuota la cache dei tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "ingrandire per caricare dei tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "ingrandire per caricare più tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "aumenta il livello di ingrandimento per vedere più dettagli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "Nessun tassello in questo livello di ingrandimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr "Sono supportate le proiezioni EPSG:4326 e di Mercatore"
@@ -13881,10 +13919,10 @@
 msgstr "Immagini JPEG (*.jpeg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "segnaposto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13892,5 +13930,5 @@
 msgstr[1] "marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13899,26 +13937,26 @@
 msgstr[1] "{0} è composto da {1} marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Non ci sono marcatori audio in questo livello da compensare."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Mostra Testo/Icone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Commuta la visualizzazione dei marcatori di testo ed icone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Sincronizza l''audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Premi pausa quando senti il segnale di sincronizzazione."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13926,14 +13964,14 @@
 msgstr "Audio sincronizzato al punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossibile sincronizzare nel livello in esecuzione."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Crea marcatore audio in prossimità della testina di riproduzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13962,13 +14000,13 @@
 msgstr "Impossibile creare un nuovo segnaposto Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Impossibile mostrare l''URL per questo marcatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Impossibile visualizzare l''URL"
@@ -15060,53 +15098,53 @@
 msgstr "Colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Disegna le frecce di direzione"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Solo sull''estremità di un percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Disegna le frecce dei sensi unici."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Disegna i numeri d''ordine dei segmenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Disegna i confini dei dati scaricati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Disegna dei nodi virtuali nella modalità selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Disegna con altri colori i layer non attivi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Grafica della mappa migliorata (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Disegna solamente i perimetri delle aree"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Punti GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Disegna il verso sui segmenti dei percorsi."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
@@ -15115,5 +15153,5 @@
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
@@ -15122,5 +15160,5 @@
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -15128,10 +15166,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Disegna i confini dei dati scaricati dal server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -15140,9 +15178,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Disegna con un colore diverso i layer non attivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -15152,15 +15190,51 @@
 "impostazione presente nello stile selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Dati OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automatico"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Nome"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Desc(rizione)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr "Tutto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr "Nome o scostamento"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Nessuno"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr "Personalizzato"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Usa le impostazioni globali."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -15171,48 +15245,40 @@
 msgstr "Tutti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "File locali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Nessuno"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Forza le linee se nessun segmento è stato importato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Disegna dei punti GPS grandi."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Disegna un cerchio in base al valore HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocità (rosso = lento, verde = veloce)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr "Direzione (rosso = ovest, giallo = nord, verde = est, blu = sud)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+msgstr "data del tracciato"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -15220,5 +15286,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -15242,5 +15308,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15283,5 +15349,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15295,38 +15361,18 @@
 msgstr "Pedone"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Crea marcatori durante la lettura del tracciato GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Disegno veloce (appare più brutto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr "Intervallo di colore dinamico basato sui limiti dei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automatico"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Nome"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Desc(rizione)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Entrambi"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15337,10 +15383,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Disegna le linee tra i punti GPS grezzi"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15350,10 +15396,10 @@
 "Usare ''-1'' per disegnare qualsiasi linea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Lunghezza massima per i file locali (metri)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15362,10 +15408,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15374,5 +15420,5 @@
 "sulle linee."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -15380,5 +15426,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15387,5 +15433,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15393,14 +15439,14 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Distanza minima (in pixel)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15410,13 +15456,13 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr "Colora i punti ed i segmenti di tracciato secondo la direzione."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15427,10 +15473,10 @@
 "registrare queste informazioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
-msgstr ""
+msgstr "Colora i punti ed i segmenti del tracciato in base alla sua data/ora."
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -15438,19 +15484,37 @@
 "velocità medie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+msgstr "Colora i punti ed i segmenti del tracciato in base ai limiti dei dati."
+
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Etichettatura dei punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr "Etichettatura audio dei punti del percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr "Schema di etichettatura dei punti del percorso non corretta: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr "Schema non corretto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
+msgstr "Schema di etichettatura audio dei punti del percorso non corretta: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
@@ -16165,11 +16229,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
 "JOSM si metterà sempre in ascolto sulla porta 8111 locale. Questa porta non "
-"è configurabile perché è utilizzata dalle applicazioni esterne che "
-"comunicano con JOSM."
+"è configurabile perché è utilizzato come riferimento dalle applicazioni "
+"esterne che tentano di contattare JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -16259,5 +16323,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Azzera"
@@ -16571,5 +16635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr "Aggiorna sempre senza chiedere"
 
@@ -17010,5 +17074,5 @@
 msgstr "Nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -17037,9 +17101,9 @@
 msgstr "Ricerca preimpostazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Visualizza solamente per la selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Cerca nelle etichette"
@@ -17350,9 +17414,9 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 "E'' stato generato un errore durante l''analisi del file gpx {0}. Sarà "
-"disponibile solamente parte del file"
+"disponibile soltanto una parte del file."
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17430,8 +17494,12 @@
 "header. Can''t redirect. Aborting."
 msgstr ""
+"Risposta non prevista dal server HTTP. E'' stata ottenuta la risposta {0} "
+"senza la testata ''Location''. Impossibile reindirizzare. Annullo."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
 msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
+"Sono stati individuati troppi reindirizzamenti all''indirizzo URL di "
+"scarico. Annullo."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
@@ -17444,4 +17512,5 @@
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
 msgstr ""
+"Fallita la lettura da ''{0}''. Il server ha risposto con il codice {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -17698,8 +17767,8 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"Il prologo del documento OsmChange non è stato ancora scritto. Si prega di "
-"scriverlo prima."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
+"Il prologo del documento OsmChange non è ancora stato scritto. Si prega "
+"prima di scriverlo."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17938,8 +18007,8 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Attributi obbligatori mancanti sull''elemento ''''bounds''''. Ottenuto "
+"Attributi obbligatori mancanti sull''elemento ''bounds''. Ottenuti "
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
@@ -18361,4 +18430,11 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Salva nome utente e password (non cifrata)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+"Attenzione: impossibile individuare il tipo di sorgente di immagini aeree "
+"'{0}'. Utilizzo il predefinito (xml)."
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -19321,4 +19397,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -19461,4 +19539,18 @@
 msgstr "Fallito il caricamento dello schema XML."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr "Token non previsto ({0}) alla posizione {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr "Token non previsto alla posizione {0}. Atteso {1}, trovato {2}"
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr "Errore nell''analisi dell''espressione di ricerca"
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -20060,6 +20152,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Permette di escludere i tracciati GPS non necessari"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr "Premette di filtrare i tracciati GPS non necessari"
 
 #. Plugin graphview
@@ -36452,4 +36544,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -36466,6 +36559,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -36484,15 +36577,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "abbreviazione del nome della strada"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "etichetta di senso unico presente su un nodo"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "nodo etichettato come ponte (bridge)"
@@ -36503,12 +36596,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "etichetta stradale errata su un nodo"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Strada non classificata priva di nome"
@@ -36517,16 +36610,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "strada senza un riferimento"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "tipo di strada temporaneo"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "nome della chiave errata"
@@ -36536,10 +36629,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "pista ciclabile con etichetta bicycle"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "footway con etichetta foot"
@@ -36548,10 +36641,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "cycleway separata come corsia su cycleway"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "barriera usata su un percorso"
@@ -36560,35 +36653,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "velocità massima per footway"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr "senso unico combinato con *:backward/forward"
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "etichetta del livello con il segno +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "il nome della strada contiene ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relazione senza tipo"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "ristorante senza nome"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr "combinazione di etichette insolita (highway & waterway)"
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "combinazione di etichette insolito"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr "combinazione di etichette insolita (highway & natural)"
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36693,118 +36795,128 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr "Geoimage.at (alta risoluzione)"
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "MSR Maps Topo"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "MSR Maps Urban"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Mappe NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "Mappe NPE (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7a Serie (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Giappone (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Giappone (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Giappone (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Giappone (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italia"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italia"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Francia)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA Spagna"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Estonia Multi (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Danimarca)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Danimarca)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Pangasinan (Phillipines HiRes)"
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
+msgstr ""
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
@@ -37058,5 +37170,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr "Caricamento annullato"
 
@@ -37159,9 +37271,9 @@
 msgstr "(Nessun dato altimetrico)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr "Impossibile salvare le preferenze"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr "Configurazione FastDraw"
@@ -37179,25 +37291,53 @@
 msgstr "Numero massimo di punti per 1 km"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr "Modalità tasto Invio"
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr "Semplificazione automatica"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr "Semplifica con un epsilon iniziale"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr "Salva com''è"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr "Blocca ai nodi"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr "Aggiungi punti fissi con il click"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr "Aggiungi punti fissi con la barra spaziatrice"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr "Impostazioni FastDraw"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr "Salva le impostazioni"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr "Impossibile leggere le impostazioni"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-"Premere Invio per semplificare o salvare, Ctrl-Invio per salvare assieme "
-"alle etichette, Su/Giù per regolare la semplificazione"
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr "Q=Opzioni, Enter=salva, Ctrl-Enter=salva con etichette, Up/Down=regola"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -37208,26 +37348,54 @@
 "Shift-Click per iniziare una nuova linea"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr "Disegno veloce"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr "Modalità di disegno veloce"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr "Muovere il mouse per disegnare un nuovo percorso"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr "Sei sicuro di non voler salvare la linea contenente {0} punti?"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informazioni sull''estensione"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr "Impossibile posizionare un nodo al di fuori dei confini della Terra."
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr "Disegna il percorso mediante il mouse"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, fuzzy, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr "distanza minima={0} pixel o {1} m"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr "Converti il percorso in una linea di disegno veloce"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -37235,5 +37403,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr "Correggi indirizzi"
 
@@ -37344,9 +37512,9 @@
 msgstr "Visualizza gli indirizzi incompleti"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "elementi"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "nessun elemento"
@@ -37450,17 +37618,39 @@
 msgstr "Seleziona tutti gli indirizzi con dati incompleti."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr "Proiezione predefinita dell''immagine"
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+"Non è stato trovato alcun file di proiezione (.prj).<br>E'' possibile "
+"scegliere la proiezione predefinita dell''immagine ({0}) oppure la "
+"proiezione corrente di JOSM ({1}) come proiezione originale dell''immagine."
+"<br>(Può essere cambiata successivamente cliccando con il tasto destro sul "
+"livello dell''immagine.)"
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Proprietà del livello"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Importa immagine"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Importa immagine georeferenziata"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Errore durante la creazione del livello immagine: "
@@ -38198,32 +38388,40 @@
 msgstr "Seleziona il comune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Sorgente auto-determinata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"L''estensione cadastre-fr usata tradizionalmente per gestire la scorciatoia "
-"da tastiera F11\n"
-"che è attualmente riservata per la modalità a tutto schermo\n"
-"Si desidera ripristinare F11 per l''azione di trascinamento?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+"L''estensione cadastre-fr per la cattura utilizzava tradizionalmente la "
+"scorciatoia F11,\n"
+"la quale è riservata al momento in modo predefinito alla commutazione a "
+"schermo intero.\n"
+"Si desidera associare nuovamente F11 all''azione di cattura?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Ripristino della scorciatoia F11 di trascinamento"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -38353,9 +38551,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Sostituire lo sfondo bianco originale con il colore di sfondo definito nelle "
-"preferenze di JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
+"Sostituisci lo sfondo originale bianco con il colore di sfondo definito "
+"nelle preferenze di JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -39290,5 +39488,5 @@
 msgstr "Aggiungi livello EGPX"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -39299,17 +39497,17 @@
 "tracciati, vedere qui:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Disegna le linee tra i punti di questo livello."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Non disegnare le linee tra i punti di questo livello."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Seleziona le opzioni per il disegno delle linee"
@@ -39465,5 +39663,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr "Non è stato selezionato alcun insieme di regole!"
@@ -39471,10 +39669,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr "Nessun insieme di regole"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -39485,5 +39683,5 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -39494,6 +39692,6 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -39504,9 +39702,9 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr "File non trovato:\n"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -39670,9 +39868,9 @@
 msgstr "Crea/aggiorna grafo"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr "Graphview"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
@@ -39680,63 +39878,71 @@
 "navigazione."
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr "Insieme di regole"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr "Utilizza gli insiemi di regole interni"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr "Cartella dell''insieme di regole Wxternal:"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr "Cartella dell''insieme di regole esterne:"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr "Seleziona la cartella"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr "Veicolo"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Crea"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr "Ripristina i valori predefiniti"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr "Visualizzazione"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr "Disegna le direzioni separatamente"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr "Colore del nodo"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr "Colore della freccia"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr "Colore di riempimento della punta della freccia"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr "Posizione della punta della freccia"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr "Nuovo segnalibro"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr "Si desidera veramente eliminare \"{0}\"?"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr "Eliminazione del segnalibro"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39746,33 +39952,27 @@
 "Tutti i segnalibri aggiunti o modificati manualmente saranno persi!"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr "Ripristina segnalibri"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr "Scegliere un colore del nodo"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr "Scegliere un colore della freccia"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr "Scegliere il colore di riempimento della punta della freccia"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr "Grafo di navigazione calcolato dall''estensione GraphView"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
 msgstr "Il livello GraphView non è unibile"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr "Nodo predefinito di GraphView"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
-msgstr "Segmento predefinito di Graphview"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:35
@@ -39816,9 +40016,9 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 "I valori di superficie non devono contenere alcuno dei seguenti caratteri: "
-"'','', ''{'',  ''}'', ''='', ''|''"
+"'','', '' '{' '',  '' '}' '', ''='', ''|''"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:38
@@ -39948,30 +40148,45 @@
 msgstr "Importazione in corso..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr "InfoMode"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr "Modalità di informazione GPX"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+"Muovere il mouse per visualizzare le informazioni sul punto del tracciato "
+"per il livello corrente. Tenere premuto shift per evidenziare i tracciati"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
 msgid "Hide this"
 msgstr "Nascondi questo"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
 msgid "Hide this&older"
 msgstr "Nascondi questo&più vecchi"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr "Nessuna marcatura temporale"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr "km/h"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr "Nome del tracciato: "
@@ -40694,8 +40909,8 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
-"A seconda del proprio sistema operativo / distribuzione, potrebbe essere "
+"In base al proprio sistema operativo / distribuzione potrebbe essere "
 "necessario creare prima un portachiavi predefinito."
 
@@ -40713,7 +40928,8 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
-msgstr ""
-"Trasferisci al gestore delle password ed elimina dal file delle preferenze"
+msgid "Transfer to password manager and remove from preference file"
+msgstr ""
+"Trasferisci verso il gestore delle password e rimuovi dal file delle "
+"preferenze"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
@@ -41467,17 +41683,17 @@
 msgstr "Nuovo livello immagine dagli appunti"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "File immagine supportati"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Nuovo livello immagine da file..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Impossibile trovare l''oggetto della mappa."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer non ha potuto caricare o importare l''immagine."
@@ -41491,43 +41707,38 @@
 msgstr "I dati contenuti negli appunti non sono un''immagine"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "E'' stato trovato un file di calibrazione associato all''immagine:"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(imposta  \"{0}\"  a si/no/chiedi nelle preferenze\n"
-"per controllare il caricamento automatico dei file di calibrazione)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+"E'' stato trovato un file di calibrazione associato all''immagine: {0}\n"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+"Imposta \"{0}\" a si/no/chiedi nelle preferenze\n"
+"per controllare il caricamento automatico dei file di calibrazione."
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "Si desidera applicarlo ?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "Caricare il file di calibrazione ?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Sarà applicato automaticamente."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-"Inoltre, d''ora in poi, i file di calibrazione saranno sempre caricati "
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
+"Inoltre, d''ora in poi, il file di calibrazione sarà sempre caricato "
 "automaticamente."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Impostare  \"{0}\"  a si/no/chiedi nelle preferenze\n"
-"per controllare il caricamento automatico dei file di calibrazione."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -42156,6 +42367,7 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
-msgstr "Scarica gli oggetti collegati per la relazione scelta ed i suoi membri"
+msgid "Download referrers for the chosen relation and its members."
+msgstr ""
+"Scarica gli oggetti collegati per la relazione scelta ed i suoi membri."
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
@@ -43158,4 +43370,26 @@
 msgstr "Crea una nuova chiave di firma"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr "Nessuna corsia."
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+"<html>Il numero delle corsie non è stato specificato per una o più strade; "
+"si prega di aggiungere le etichette mancanti per le corsie.</html>"
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+"<html>E'' stato generato un errore durante la costruzione del modello. Si "
+"prega di eseguire il validatore per essere sicuri che i dati siano "
+"consistenti.<br><br>Errore: {0}</html>"
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -43398,12 +43632,12 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
-"Questo divieto di svolta si riferisce ad un oggetto che è stato eliminato al "
-"di fuori di questo editor:"
+"Questo divieto di svolta si riferisce ad un oggetto che è stato eliminato "
+"esternamente a questo editor:"
 msgstr[1] ""
-"Questo divieto di svolta si riferisce a {0} che sono stati eliminati al di "
-"fuori di questo editor:"
+"Questo divieto di svolta si riferisce a {0} oggetti che sono stati eliminati "
+"esternamente a questo editor:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -43667,5 +43901,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr "Apri un editor per il divieto di svolta selezionato"
 
@@ -44316,5 +44550,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 "Saranno selezionati i percorsi adiacenti. I nodi saranno deselezionati."
@@ -44726,4187 +44960,96 @@
 msgstr "Guida una macchina da corsa su questo livello"
 
-#~ msgid "No data imported."
-#~ msgstr "Nessun dato importato."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Non ancora implementato."
-
-#~ msgid "Load Selection"
-#~ msgstr "Carica selezione"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ricarica la lista di selezione"
-
-#~ msgid "Jump back."
-#~ msgstr "Torna indietro"
-
-#~ msgid "WMS URL"
-#~ msgstr "URL WMS"
-
-#~ msgid "File could not be found."
-#~ msgstr "Impossibile trovare il file."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Inserire dei valori per tutti i conflitti."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Selezionare almeno un compito per scaricare"
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "gps track description"
-#~ msgstr "descrizione della traccia GPS"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgid "Change values?"
+#~ msgstr "Cambiare i valori?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "combinazione di etichette insolito"
+
+#~ msgid ""
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
+#~ "Sostituire lo sfondo bianco originale con il colore di sfondo definito "
+#~ "nelle preferenze di JOSM."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Caricamento annullato"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Mantieni le loro coordinate"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Mantieni le mie coordinate"
 
 #~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Clicca per cancellare. Shift: cancella un segmento del percorso. Alt: non "
-#~ "cancellare i nodi inutilizzati quando elimini un percorso. Ctrl: cancella "
-#~ "gli oggetti che si riferiscono a questo."
-
-#~ msgid "Drag a way segment to make a rectangle."
+#~ "L''eccezione verrà ignorata perché lo scaricamento è stato annullato. "
+#~ "Eccezione: {0}"
+
+#~ msgid ""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Trascina il segmento un segmento di un percorso per disegnare un "
-#~ "rettangolo."
-
-#~ msgid "Move"
-#~ msgstr "Sposta"
-
-#~ msgid "Create a new map."
-#~ msgstr "Crea una nuova mappa."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Impossibile rinominare il file \"{0}\"."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "L'estensione del file è sconosciuta."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Si è verificato un errore durante il salvataggio."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Inserire una stringa di ricerca."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Carica tutti i cambiamenti sul server OSM."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Caricare questi cambiamenti?"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Ci sono dei conflitti non risolti. Prima è necessario risolverli."
-
-#~ msgid "Uploading data"
-#~ msgstr "Caricamento dei dati"
-
-#~ msgid "Change"
-#~ msgstr "Cambia"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
-
-#~ msgid "Rotate"
-#~ msgstr "Ruota"
-
-#~ msgid "different"
-#~ msgstr "diverso"
-
-#~ msgid "true"
-#~ msgstr "vero"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "position"
-#~ msgstr "posizione"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Impossibile leggere i segnalibri."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Impossibile scrivere i segnalibri."
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} oggetto causa conflitti:"
-#~ msgstr[1] "{0} oggetti causano conflitti:"
-
-#~ msgid "my version:"
-#~ msgstr "versione locale:"
-
-#~ msgid "their version:"
-#~ msgstr "versione remota:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versione risolta:"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolvi conflitti"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
+#~ "Attenzione: fallita l''inizializzazione delle preferenze.Non è stato "
+#~ "possibile reimpostare il file delle preferenze con uno predefinito: {0}"
+
+#~ msgid "Changeset"
+#~ msgstr "Insieme di modifiche"
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
-#~ "versione selezionata nella lista della cronologia."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Cancella il livello selezionato."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Vuoi veramente cancellare tutto il livello?"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Mostra/Nascondi testo/icone"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Unisci il layer direttamente nel layer selezionato sotto"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Un valore vuoto cancella la chiave."
-
-#~ msgid "Create new relation"
-#~ msgstr "Crea nuova relazione"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Modifica nuova relazione"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Modifica la relazione #{0}"
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupato da"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr ""
-#~ "Cancella il membro dalla riga della tabella utilizzata da questa relazione"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Errore di scansione nella risposta del server."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossibile connettersi al server."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Per prima cosa inserisci le coordinate della località."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Inserisci il nome della località."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Per prima cosa, scegli un segnalibro."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Sorgenti di dati e tipi"
-
-#~ msgid "Download Area"
-#~ msgstr "Area da scaricare"
-
-#~ msgid "to"
-#~ msgstr "a"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
-#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
-
-#~ msgid "Images for {0}"
-#~ msgstr "Immagini per {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Leggi GPX..."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Non è stata trovata nessuna immagine con una data leggibile."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS inizio: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS fine: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "differenza attuale: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "differenza fuso orario: "
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "immagine"
-#~ msgstr[1] "immagini"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} in questa traccia."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sincronizza tempo"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Impossibile leggere la data nel file \"{0}\"."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Impossibile decodificare l'orario inserito."
-
-#~ msgid "Timespan: "
-#~ msgstr "Timespan/Arco di tempo: "
-
-#~ msgid "Length: "
-#~ msgstr "Lunghezza: "
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} eliminati)"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punto"
-#~ msgstr[1] "punti"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "una traccia con {0} punto"
-#~ msgstr[1] "una traccia con {0} punti"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} è composto da {1} traccia"
-#~ msgstr[1] "{0} è composto da {1} tracce"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punto"
-#~ msgstr[1] "{0} punti"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Apri il file (come gps grezzo se .gpx)"
+#~ "Attributi obbligatori mancanti sull''elemento ''''bounds''''. Ottenuto "
+#~ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', "
+#~ "origin=''{5}''."
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "I parametri sono letti nell'ordine in cui sono specificati,\n"
-#~ "quindi assicurati di caricare dei dati prima di indicare una selezione."
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Invece di --download=<zona> puoi utilizzare osm://<zona>\n"
-
-#~ msgid "layer not in list."
-#~ msgstr "livello non in lista."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Connessione al server OSM..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Impossibile interpretare"
-
-#~ msgid "File not found"
-#~ msgstr "File non trovato"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Crea marcatori non-audio quando leggi un file GPX."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "L'URL di base per il server OSM (API REST)"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nome utente (email) per l'account di OSM."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
-#~ "password."
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL di base per il server"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Username OSM (email)"
-
-#~ msgid "OSM password"
-#~ msgstr "Password OSM"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr ""
-#~ "Errore di scansione: struttura del documento non valida per un documento "
-#~ "gpx"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nome utente o password errati."
-
-#~ msgid "Enter Password"
-#~ msgstr "Inserire la password"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interruzione in corso"
-
-#~ msgid "Error during parse."
-#~ msgstr "Errore nella scansione."
-
-#~ msgid "Unknown version"
-#~ msgstr "Versione sconosciuta"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Trovato <nd> elemento in non-percorso."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ha zero ref"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Oggetto illegale con id=0"
-
-#~ msgid "Commit comment"
-#~ msgstr "Inserisci commento"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
-#~ "sul server."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Si è verificata un'eccezione inattesa.\n"
-#~ "\n"
-#~ "Questo è sempre un errore di programmazione. Se si sta usando la "
-#~ "versione\n"
-#~ "di JOSM più recente, si consideri gentilmente la possibilità di\n"
-#~ "inoltrare un bug report."
-
-#~ msgid "Do not show again"
-#~ msgstr "Non mostrare di nuovo"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rotazione della griglia"
-
-#~ msgid "World"
-#~ msgstr "Mondo"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Livello della griglia:"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigazione"
-
-#~ msgid "osmarender options"
-#~ msgstr "Opzioni osmarender"
-
-#~ msgid "start"
-#~ msgstr "inizio"
-
-#~ msgid "end"
-#~ msgstr "fine"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Inserire un nome per il menù e un URL WMS"
-
-#~ msgid "Jump forward"
-#~ msgstr "Salta Avanti"
-
-#~ msgid "Next Marker"
-#~ msgstr "Contrassegno successivo"
-
-#~ msgid "Play next marker."
-#~ msgstr "Esegui il contrassegno successivo"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Membri: {0}"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Seleziona, muovi e ruota gli oggetti."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Unire i nodi con diffenti appartenenze?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Errore durante il caricamento della pagina {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Apri nel Browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Guida in linea di JOSM"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Seleziona almeno due nodi da unire."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
-#~ "questo come bug."
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Cancella {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Cancella {1} {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Ci sono modifiche non salvate. Cancellare comunque il layer?"
-
-#~ msgid "Set the language."
-#~ msgstr "Imposta la lingua."
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Conflitto tra relazioni"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividi il segmento del percorso"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Unisci i conflitti."
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Zona di Lambert (Francia)"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Host del server proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonimo"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Abilita il server proxy"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versione {1}{2}"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Porta del server poxy"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Password del server proxy"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Il server ha restituito un errore interno. Prova con un'area piccola o "
-#~ "aspetta prima di riprovare."
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Mi trovo nel fuso orario di: "
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Immagini senza posizione exif"
-
-#~ msgid "All images"
-#~ msgstr "Tutte le immagini"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "La selezione \"{0}\" è usata dalla relazione \"{1}\" con le regole {2}.\n"
-#~ "Cancellare dalla relazione?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "La selezione \"{0}\" è usata dalla relazione \"{1}\".\n"
-#~ "Cancellare dalla relazione?"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Contrassegno precedente"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Esegui contrassegno precedente"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Avanzamento lento"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Seleziona esattamente tre nodi oppure un percorso formato esattamente da "
-#~ "tre nodi."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Errore durante il ripristino di un file di backup."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Impossibile creare una copia di backup."
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Impostazioni Proxy"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - fotografie con geotag"
-
-#~ msgid "Open an other photo"
-#~ msgstr "Apri un'altra fotografia"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Duplica i percorsi selezionati."
-
-#~ msgid "Grid layout"
-#~ msgstr "Layout griglia"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Aggiusta la posizione dl layer WMS"
-
-#~ msgid "help"
-#~ msgstr "aiuto"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Correggi gli errori selezionati."
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Non applicare cambiamenti"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Questi nodi non sono disposti in cerchio"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Era attesa una parentesi chiusa."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Lunghezza massima (in metri) per disegnare le linee. Impostare a '-1' per "
-#~ "permettere qualsiasi lunghezza."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Grazie per la comprensione</p>"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Avanti più veloce"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Tutti i percorsi erano vuoti"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Argomenti mancanti per l'operatore booleano OR."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Argomento mancante per l'operatore booleano NOT."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Duplica {0} nodi in {1} nodi"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (correzione GNOME)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id dell'immagine Metacarta Map Rectifier"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Scarica il tassello WMS da {0}"
-
-#~ msgid "y from"
-#~ msgstr "coordinata y di partenza"
-
-#~ msgid "x from"
-#~ msgstr "coordinata x di partenza"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Si può notare che nella lista di selezione dei tasti nella prossima "
-#~ "pagina sono elencati tutti i tasti che sono presenti in tutte le "
-#~ "tipologie di tastiera riconosciute da Java, e non solamente i tasti "
-#~ "presenti sulla propria tastiera specifica. Si invita pertanto ad usare "
-#~ "solamente quei valori che corrispondono a un tasto reale della propria "
-#~ "tastiera. Se, ad esempio, la propria tastiera non possiede un tasto "
-#~ "'Copia' (le tastiere dei PC non ce l'hanno, mentre quelle della Sun si), "
-#~ "non usarlo. Ci saranno anche dei 'tasti' elencati che corrispondono ad "
-#~ "una scorciatoia sulla propria tastiera (ad es. ':'/Doppio punto). Si "
-#~ "invita a non usare neanche questi; usare piuttosto il tasto base (';'/"
-#~ "Punto e virgola su tastiere US, '.'/Punto su tastiere italiane, ...). Se "
-#~ "non si seguono queste indicazioni ci potrebbero essere dei conflitti, "
-#~ "così come non c'è modo per JOSM di sapere che Ctrl+Shift+; e Ctrl+: su "
-#~ "tastiere US sono la stessa cosa...</p>"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Attenzione - era richiesto il caricamento del plugin {0}. Questo plugin "
-#~ "non è più necessario."
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Visualizza le foto geo-referenziate"
-
-#~ msgid "Update position for: "
-#~ msgstr "Aggiorna la posizione per: "
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Immagini ancora senza etichetta"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo "
-#~ "essere di aiuto?</html>"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Tracciato GPS caricato"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Duplica percorso"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Crea un percorso duplicato"
-
-#~ msgid "Boat"
-#~ msgstr "Barca"
-
-#~ msgid "Motorboat"
-#~ msgstr "Barca a motore"
-
-#~ msgid "Goods"
-#~ msgstr "Carico e scarico merci"
-
-#~ msgid "Bridleway"
-#~ msgstr "Percorso per equitazione"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Modifica percorso escursionistico"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Percorso escursionistico montano"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Modifica percorso escursionistico montano"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Percorso escursionistico montano difficile"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Modifica percorso escursionistico montano difficile"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Percorso escursionistico alpino"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Modifica percorso escursionistico alpino"
-
-#~ msgid "Station"
-#~ msgstr "Stazione"
-
-#~ msgid "Shop"
-#~ msgstr "Negozio"
-
-#~ msgid "Edit Station"
-#~ msgstr "Modifica stazione"
-
-#~ msgid "football"
-#~ msgstr "football_americano"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "La prossima volta ignora gli errori selezionati"
-
-#~ msgid "Help / About"
-#~ msgstr "Aiuto / Informazioni su"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Rimuovi un membro dalla relazione"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Download List"
-#~ msgstr "Scarica la lista"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "L'appartenenza ad una relazione basata su regole è stata copiata a tutti "
-#~ "i nuovi percorsi.\n"
-#~ "Controllare ed eventualmente correggere."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Unire i percorsi con diverse appartenenze?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>Lo pseudo-modificatore 'disabled' disabiliterà il collegamento quando "
-#~ "verrà trovato</p>"
-
-#~ msgid "Accomodation"
-#~ msgstr "Alloggiamento"
-
-#~ msgid "Football"
-#~ msgstr "Football"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Sport motoristici"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Modifica Sport Motoristici"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Modifica Rugby"
-
-#~ msgid "Charge"
-#~ msgstr "Costo"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "I dati contengono errori. Caricarli ugualmente?"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Inserire la stringa da cercare"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "change the viewport"
-#~ msgstr "cambia la visualizzazione"
-
-#~ msgid "load data from API"
-#~ msgstr "carica dati dalle API"
-
-#~ msgid "change the selection"
-#~ msgstr "cambia la selezione"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Azioni permesse"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "conferma manualmente tutte le azioni di controllo remoto"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Una estensione che permette a JOSM di essere controllato da altre "
-#~ "applicazioni."
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "error requesting update"
-#~ msgstr "errore nella richiesta di aggiornamento"
-
-#~ msgid "requested: {0}"
-#~ msgstr "richiesta: {0}"
-
-#~ msgid "error loading metadata"
-#~ msgstr "errore nel caricamento dei metadati"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianismo"
-
-#~ msgid "Request Update"
-#~ msgstr "Richiesta di aggiornamento"
-
-#~ msgid "image not loaded"
-#~ msgstr "immagine non caricata"
-
-#~ msgid "Edit Football"
-#~ msgstr "Modifica football"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Rotella del mouse o doppio click. Spostamento della mappa: muovere "
-#~ "il mouse tenendo premuto il tasto destro. Selezionare: click."
-
-#~ msgid "Grid"
-#~ msgstr "Griglia"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Combinazione illegale etichetta/valore"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "identificativo rectifier={0}"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Gruppo di preimpostazioni \"{0}\""
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Sorgenti preimpostazioni etichette"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Sorgente preimpostazioni etichette"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr ""
-#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
-
-#~ msgid "Tile Sources"
-#~ msgstr "Sorgenti dei tasselli"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Mostra lo stato dei tasselli"
-
-#~ msgid "Downloading..."
-#~ msgstr "Scaricamento in corso..."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Attivazione estensioni aggiornate"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM "
-#~ "ha i permessi per sovrascrivere quelle esistenti."
-
-#~ msgid "No plugin information found."
-#~ msgstr "Non è stata trovata alcuna informazione sulle estensioni."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Informazioni sulle estensioni scaricate da {0} sito"
-#~ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Tutte le estensioni sono state aggiornate."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Ci sono stati dei problemi con le seguenti estensioni:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Estensione non trovata: {0}."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Aggiorna estensioni"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Scarica le estensioni mancanti"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Scaricare le seguenti estensioni?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr ""
-#~ "Impossibile leggere il file con le informazioni sulle estensioni: {0}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Aggiorna le seguenti estensioni:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Aiuto sull'estensione WMS"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da "
-#~ "cui si è ottenuto JOSM."
-
-#~ msgid "near"
-#~ msgstr "vicino a"
-
-#~ msgid "zoom"
-#~ msgstr "livello di ingrandimento"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track Grade 3"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track Grade 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track Grade 1"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track Grade 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track Grade 5"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Attributo richiesto mancante \"{0}\""
-
-#~ msgid "Footway"
-#~ msgstr "Footway"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cycleway"
-
-#~ msgid "Add Selected"
-#~ msgstr "Aggiungi la selezione"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparazione in corso..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Invio in corso..."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Si può modificare il numero di giorni dopo il quale appare questo "
-#~ "avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
-#~ "warntime'.)"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Modifica proprietà"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Errore nell'eliminazione del file dell'estensione: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Estensione già esistente"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Gradi Minuti Secondi"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "O"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "La selezione deve comprendere solo percorsi."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Sono permessi solo due nodi"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Si sta utilizzando la proiezione EPSG:4326 che potrebbe "
-#~ "portare<br>a degli effetti indesiderati nell'allineamento rettangolare."
-#~ "<br>Cambiare la proiezione per non ottenere più questo avvertimento."
-#~ "<br>Si vuole continuare?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Solo un nodo selezionato"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Usa i gradi decimali."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Inserire le coordinate per il nuovo nodo."
-
-#~ msgid "Copy Default"
-#~ msgstr "Copia predefinito"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Selezionare la riga da copiare."
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "URL WMS (Predefinito)"
-
-#~ msgid "citymap"
-#~ msgstr "mappa cittadina"
-
-#~ msgid "hikingmap"
-#~ msgstr "mappa escursionistica"
-
-#~ msgid "map"
-#~ msgstr "mappa"
-
-#~ msgid "bicyclemap"
-#~ msgstr "mappa ciclistica"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Ponte levatoio"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Il server non supporta i changeset (API < 0.6)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Non disegnare le frecce se non sono distanti dalla precedente almeno"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Formato non corretto: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Errori di checksum: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Importazione NMEA non riuscita!"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Frase sconosciuta "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Coordinate iniziali "
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Si prega di segnalare il problema a {0}"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Assicurarsi di includere le seguenti informazioni:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Includi i passi necessari per riprodurre l'errore (il più "
-#~ "dettagliatamente possibile)!"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Alcuni nodi sono (quasi) in linea"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Impossibile creare una nuova segnalazione. Risultato: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importa file TCX come tracciato GPS"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importa file TCX..."
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Numero di linee"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Apri immagini con AgPifoJ..."
-
-#~ msgid ""
-#~ "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 di segnalare un problema."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, è possibile che manchino delle etichette."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Trovato etichetta <member> su una non relazione."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Id del nodo malformato"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
-#~ "preferenze.<br>La password è trasferita al server in chiaro, codificata "
-#~ "nell'URL<br><b>Non usare una password importante.</b></html>"
-
-#~ msgid ""
-#~ "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 "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Impossibile leggere \"{0}\""
-
-#~ 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"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Impossibile duplicare un percorso senza direzione."
-
-#~ 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 ""
-#~ "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 ?"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Scarica l'immagine rettificata dal WMS Map Rectifer di Metacarta"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Si può aggiungere editare o cancellare le voci WMS nella scheda delle "
-#~ "preferenze di WMSplugin - queste saranno poi visualizzate nel menu WMS.\n"
-#~ "\n"
-#~ "La stessa cosa può essere fatta anche manualmente nelle preferenze "
-#~ "avanzate, usando il seguente 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"
-#~ "Esempio di formato URL di input WMS completo (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"
-#~ "Per il rettificatore di mappe Metacarta http://labs.metacarta.com/"
-#~ "rectifier/ , è sufficiente inserire l'identificativo pertinente.\n"
-#~ "Per aggiungere una voce al menù relativo al rettificatore di mappe "
-#~ "Metacarta, creare manualmente l'URL come in questo esempio, sostituendo "
-#~ "73 con l'identificativo della propria immagine: \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"
-#~ "Nota: assicurarsi che l'immagine sia adatta ed in regola con i diritti "
-#~ "d'autore. Se si è in dubbio non usarla."
-
-#~ msgid "Portcullis"
-#~ msgstr "Saracinesca"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Nodi senza etichetta e non connessi"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Il plugin {0} sembra danneggiato o non è stato possibile scaricarlo "
-#~ "automaticamente."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La proiezione \"{0}\" è progettata solo per \n"
-#~ "latitudini comprese tra 46.1° e 57°.\n"
-#~ "Usa un altro sistema di proiezione se non stai usando\n"
-#~ "un server WMS francese.\n"
-#~ "Non caricarire nessun dato dopo questo messaggio."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Carica su OSM..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Configura i siti..."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Errore: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Attenzione: {0}"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Membro vuoto nella relazione."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "Il file delle preferenze contiene degli errori. Copia di backup del "
-#~ "vecchio file su {0}."
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Sostituisci la selezione con i dati dell'utente"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Apri la pagina dell'utente nel browser"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Visualizza il pannello degli autori"
-
-#~ msgid "Open User Page"
-#~ msgstr "Apri la pagina dell'utente"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Seleziona i dati dell'utente"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr ""
-#~ "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Lo stile per il percorso esterno ''{0}'' è discordante."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Non-percorso ''{0}'' nel multi-poligono."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Rimuovi \"{0}\" per {1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Rimuovi \"{0}\" per {1} ''{2}''"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Eliminato il membro ''{0}'' nella relazione."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Percorso ''{0}'' con meno di due punti."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Il percorso interno ''{0}'' è esterno."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Impossibile aprire la cartella delle preferenze: {0}"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Uno dei file selezionati è nullo !!!"
-
-#~ msgid "Painting problem"
-#~ msgstr "Problema di disegno"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Controllare le note di disegno."
-
-#~ msgid "Please select some data"
-#~ msgstr "Selezionare alcuni dati"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Controllare se il disegno della mappa contiene degli errori."
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Scegliere un utente mediante il pannello degli autori"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Spiacente, ma non funziona con gli utenti anonimi"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti."
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{0}\""
-
-#~ 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 selezione contiene {0} percorso. Sei sicuro di volerlo semplificare?"
-#~ msgstr[1] ""
-#~ "La selezione contiene {0} percorsi. Sei sicuro di volerli semplificare "
-#~ "tutti?"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Geofabrik.de dell'Alto Palatinato"
-
-#~ msgid "park_and_ride"
-#~ msgstr "parcheggio di interscambio"
-
-#~ msgid "board"
-#~ msgstr "tavola"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autori: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Livelli: {0}"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Impossibile connettersi al server osm. Controllare la propria connessione "
-#~ "ad internet."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Pila dei comandi: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflitti: {0}"
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Mantieni i file di backup"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Il percorso dello stile dell''area non è chiuso."
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Apri la finestra di OpenStreetBugs e attiva lo scaricamento automatico"
-
-#~ msgid "History of Element"
-#~ msgstr "Storico dell'elemento"
-
-#~ msgid "Amenities"
-#~ msgstr "Servizi"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Mostra la cronologia di percorsi e nodi in OSM"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "La proiezione non può essere letta dalle preferenze. Si utilizzerà "
-#~ "EPSG:4326"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "E'' stato ignorato un percorso perché include un nodo che non esiste: "
-#~ "{0}\n"
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Via Nazionale\"</b> - ''Via Nazionale'' in qualunque chiave o nome."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Naz</b> - ''Naz'' in qualunque punto del nome."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Via Nazionale</b> - ''Via'' e ''Nazionale'' in qualunque chiave o nome."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Naz</b> - ''Naz'' non presente all''interno del nome."
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - oggetto con un dato numero di nodi"
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - oggetto con un dato ID"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Utilizzare <b>\"</b> per racchiudere gli operatori (es. se la chiave "
-#~ "contiene :)"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Non è stato trovato lo stile per la restrizione {0}."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Non è stato trovato un percorso \"from\"."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Non è stato trovato un percorso \"to\"."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Ruolo ''{0}'' sconosciuto."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Tipo di membro sconosciuto per ''{0}''."
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANTE: dati posizionati lontano dai limiti\n"
-#~ "della zona di Lambert attualmente usata.\n"
-#~ "Non caricare nessun dato dopo questo messaggio.\n"
-#~ "Annulla l'ultima operazione, salva il tuo lavoro\n"
-#~ "e crea un nuovo layer sulla nuova zona."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Sincronizza l'orario con l'unità GPS"
-
-#~ msgid "intermedia"
-#~ msgstr "intermedia"
-
-#~ msgid "advance"
-#~ msgstr "avanzato"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Modifica Negozio di Bevande"
-
-#~ msgid "optician"
-#~ msgstr "Ottico"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Se selezionato rende pubblico il proprio tracciato in openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Pubblico"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Aggiungi un nuovo livello"
-
-#~ msgid "No password provided."
-#~ msgstr "Non è stata fornita alcuna password."
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Aprire prima un livello (GPX, OSM, cache)"
-
-#~ msgid "No username provided."
-#~ msgstr "Non è stato fornito alcun nome utente."
-
-#~ msgid "Zone"
-#~ msgstr "Zona"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due "
-#~ "zone)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Zona di Lambert"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "File cache della zona 4 di Lambert (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "File cache della zona 1 di Lambert (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "File cache della zona 3 di Lambert (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "File cache della zona 2 di Lambert (.2)"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Collegamento a {0} in corso..."
-
-#~ msgid "Preparing data..."
-#~ msgstr "Preparazione dei dati in corso..."
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Aggiunta l'auto-etichettatura della sorgente:"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "La zona di Lambert {0} nella cache è incompatibile con la zona di Lambert "
-#~ "corrente {1}"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} rimanenti. Caricamento di {4}: {5} (id: {6})"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Selezionare la tabella di assemblaggio"
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Moltiplicatore di attrazione dell'immagine:"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Imposta {0}={1} per {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Imposta {0}={1} per {2} {3}"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Salva ed Esci"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Elimina gli elementi selezionati"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Rimuovi dalla relazione gli elementi selezionati"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "La località {0} non è stata trovata nel WMS.\n"
-#~ "Verificane la presenza su www.cadastre.gouv.fr"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Centro del easter: {0}"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Altezza massima (metri)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Larghezza massima (metri)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Lunghezza massima (metri)"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Estrai le piante degli edifici"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Estensione aggiornata con successo. Riavviare JOSM."
-#~ msgstr[1] "{0} Estensioni aggiornate con successo. Riavviare JOSM."
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Scarica immagine dal WMS francese del catasto"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Un gestore speciale del wms francese del catasto all'indirizzo www."
-#~ "cadastre.gouv.fr<BR><BR>Leggere i Termini e Condizioni d'Uso qui (in "
-#~ "francese): <br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>prima di effettuare "
-#~ "qualsiasi caricamento di dati creati da questa estensione."
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Per abilitare l'estensione WMS del catasto, cambiare\n"
-#~ "la proiezione di JOSM a Lambert e riavviare JOSM."
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Elimina livello"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Scarica Estensioni"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Elimina e Scarica"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Unisci comunque"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Risolvi conflitti"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Incorpora comunque"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continua comunque"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Attualmente solo due aree possono essere unite."
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato."
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "QUESTO E'' SPERIMENTALE. Salva il tuo lavoro e verificalo prima di "
-#~ "caricarlo."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" non è chiuso e quindi non può essere unito."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito."
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor relazione: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Risolvi conflitto"
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Non è stato trovato alcun nodo o percorso \"via\"."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Selezionare almeno un nodo, percorso o relazione. Solo gli elementi già "
-#~ "caricati hanno uno storico."
-
-#~ msgid "Move Up"
-#~ msgstr "Sposta in alto"
-
-#~ msgid "Move Down"
-#~ msgstr "Sposta in basso"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Spostare gli oggetti trascinandoli; Shift per aggiungere alla selezione "
-#~ "(Ctrl per togliere); Shift-Ctrl per ruotare i selezionati; oppure "
-#~ "modificare la selezione"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Questa azione richiederà {0} richieste individuali di scaricamento. Si "
-#~ "desidera continuare?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Aggiorna i dati correnti del livello prelevandoli dal server (ri-scarica "
-#~ "i dati)"
-
-#~ msgid "Update Data"
-#~ msgstr "Aggiorna dati"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Modificare prima la proiezione in {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Proiezione non valida"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Le foto selezionate non contengono informazioni sull'ora."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Le foto non contengono informazioni sull'ora"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Il tracciato GPX selezionato non contiene le marcature temporali. "
-#~ "Selezionarne un altro."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Trovate {0} corrispondenze {1} nel tracciato GPX {2}"
-
-#~ msgid "Default Values"
-#~ msgstr "Valori predefiniti"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Differenza di orario pari a {0} giorni)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Correlate {0} su {1} foto al tracciato GPX."
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Un errore è stato rilevato durante il tentativo di correlare le foto al "
-#~ "tracciato GPX. E' possibile far corrispondere le foto in modo manuale."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Differenza tra il tracciato e le foto: {0}m {1}s"
-
-#~ msgid "Fade background: "
-#~ msgstr "Smorza lo sfondo: "
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Modifica Track Grade 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Modifica Track Grade 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Modifica Track Grade 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Modifica Track Grade 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Modifica Track Grade 5"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Percorso escursionistico alpino difficile"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Modifica percorso escursionistico alpino difficile"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Percorso escursionistico alpino molto difficile"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Modifica un percorso escursionistico alpino molto difficile"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Modifica ponte levatoio"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Modifica saracinesca"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Non è stato trovato alcun dato da aggiornare. E' stato già aperto o "
-#~ "scaricato un livello dati?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr ""
-#~ "Sono stati rilevati i seguenti errori durante lo scaricamento di massa:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Errori durante lo scaricamento"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr ""
-#~ "Selezionare un percorso chiuso singolo composto da almeno quattro nodi."
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Modifica ufficio informazioni"
-
-#~ msgid "Map Type"
-#~ msgstr "Tipo di mappa"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Modifica aeroporto"
-
-#~ msgid "Board Type"
-#~ msgstr "Tipo di tabellone"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Cartello di indicazioni (escursionismo)"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Questo test controlla se due strade, ferrovie o corsi d'acqua si "
-#~ "incrociano sullo stesso livello senza essere connessi a vicenda tramite "
-#~ "un nodo."
-
-#~ msgid "sports"
-#~ msgstr "Articoli sportivi"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- la versione in esecuzione è {0}"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Abilita/disabilita visualizzazione a schermo pieno"
-
-#~ msgid "Full Screen"
-#~ msgstr "Schermo pieno"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
-#~ "<A HREF=\"{1}\">la propria lingua</A>."
-
-#~ msgid "Add grid"
-#~ msgstr "Aggiungi griglia"
-
-#~ msgid "Optional"
-#~ msgstr "Opzionale"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Un'altra estensione JOSM per la geo-etichettatura. Correla le immagini "
-#~ "con i tracciati GPS oppure importa le immagini geo-etichettate mediante "
-#~ "EXIF."
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr ""
-#~ "Un particolare gestore per il server WMS del registro territoriale "
-#~ "francese."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Visualizza una immagine di sfondo OpenLayers"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simula un click quando si effettua un piccolo e breve trascinamento. E' "
-#~ "utile per le penne dei tablet, quando si hanno dei problemi semplicemente "
-#~ "cliccando il tablet senza lo spostamento del mouse (in generale un "
-#~ "problema Java - tablet)."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Visualizza una griglia slippy map in JOSM. Può caricare come sfondo i "
-#~ "tasselli dalla slippy map e richiedere aggiornamenti."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Carica i file TCX direttamente da JOSM."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Strumenti per lavorare con autori/utenti. Seleziona i dati della mappa "
-#~ "che appartengono ad un utente selezionato, apre il browser per la "
-#~ "visualizzazione della pagina del profilo dell'autore."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Alcune utilità per rendere la propria vita più facile: ad esempio la "
-#~ "semplificazione dei percorsi, l'unione di aree, il salto alla posizione."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplica i percorsi con una differenza"
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "La caratteristica principale dell'estensione è la possibilità di "
-#~ "eliminare i punti del tracciato GPX. Questa estensione può essere "
-#~ "utilizzata per preparare i tracciati per il loro caricamento su OSM, ad "
-#~ "esempio eliminando le parti che non interessano di un tracciato."
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Rimuovi nodi dell'itinerario"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Cliccare e trascinare per spostare i nodi dell'itinerario."
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Cliccare per aggiungere nodi all'itinerario."
-
-#~ msgid "Start routing"
-#~ msgstr "Inizia navigazione"
-
-#~ msgid "<multiple>"
-#~ msgstr "<multiplo>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Unisi Aree: Elimina le way corte"
-
-#~ msgid "Closed Way"
-#~ msgstr "Strada chiusa (anello)"
-
-#~ msgid "Fix relations"
-#~ msgstr "Correggi le relazioni"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Il file dell''estensione è già disponibile in locale. Desideri scaricare "
-#~ "la versione aggiornata ed eliminare il vecchio archivio?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr ""
-#~ "Ci sono delle modifiche non salvate. Abbandonare le modifiche e "
-#~ "continuare?"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Modifiche non salvate"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Supporta le versioni 0.5 e 0.6 del protocollo, mentre il server dice di "
-#~ "supportare le versione da {0} a {1}."
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr ""
-#~ "Le comunicazioni con {0} sono state instaurate mediante la versione {1} "
-#~ "del protocollo"
-
-#~ msgid "Not initialized"
-#~ msgstr "Non inizializzato"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "I dati OSM sono privi del numero di versione"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Versione sconosciuta: {0}"
-
-#~ msgid "Error processing changeset upload response"
-#~ msgstr ""
-#~ "Errore nell'elaborazione della risposta al caricamento del gruppo di "
-#~ "modifiche"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr ""
-#~ "Non è presente alcun gruppo di modifiche per il caricamento differenziale"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Massima lunghezza (in metri) per il tracciamento di linee in files "
-#~ "locali. Usare '-1' per disegnare qualsiasi linea.\r\n"
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La proiezione \"{0}\" è progettata solamente per\n"
-#~ "latitudini comprese fra 45.7° e 47.9\n"
-#~ "e longitudini comprese fra 5.7° e 10.6°.\n"
-#~ "Usa un altro sistema di proiezione se non stai lavorando\n"
-#~ "su un set di dati relativo alla Svizzera od al Liechtenstein.\n"
-#~ "Non caricare altri dati dopo questo messaggio."
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Il caricamento dei dati è fallito per una ragione sconosciuta"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Impossibile leggere valori numerici dalla risposta"
-
-#~ msgid "linked"
-#~ msgstr "collegato"
-
-#~ msgid "More details"
-#~ msgstr "Maggiori dettagli"
-
-#~ msgid "% of lat:"
-#~ msgstr "% di lat:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% di lon:"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile."
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "La proiezione non può essere letta dalle preferenze. Verrà utilizzata "
-#~ "quella di Mercatore"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "CambiaRuoloMembroRelazione"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Missing attribute \"version\" on OSM primitive with id {0}"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Manca l''attributo \"ref\" sul membro della relazione {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Valore non permesso per l''attributo \"ref\" sul membro della relazione "
-#~ "{0}, ottenuto {1}"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Manca l''attributo \"type\" sul membro {0} della relazione {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Valore non permesso per l''attributo \"version\" sulla primitiva OSM con "
-#~ "id {0}, ottenuto {1}"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "E'' fallito il tentativo di inizializzare la comunicazione con il server "
-#~ "OSM {0}.\n"
-#~ "Controllare l''indirizzo URL del server nelle proprie preferenze e la "
-#~ "propria connessione ad internet."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr ""
-#~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Apertura del gruppo di modifiche..."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr ""
-#~ "<b>type=route</b> - chiave 'type' che contiene esattamente il valore "
-#~ "'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - chiave 'type' contenente qualsiasi valore. Prova anche "
-#~ "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Resolve conflicts in member list of of relation {0}"
-#~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Numero errato di parametri per operatore sui nodi."
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Risolvi {0} conflitti sulle etichette in {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Risolvi i conflitti nella lista di nodi del percorso {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Risolvi i conflitti di versione per {0} {1}"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Etichette({0} conflitti)"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "il ruolo {0} non partecipa nella comparazione {1}"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} conflitti di etichette in attesa di risoluzione"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "elemento {0} non trovato nella lista"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "parametro attualmente fuori scala: ottenuto {0}"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copia i miei elementi selezionati alla fine della lista degli elementi "
-#~ "uniti"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Copia i miei elementi selezionati prima del primo elemento selezionato "
-#~ "nella lista degli elementi uniti"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Copia il loro elemento selezionato all'inizio della lista degli elementi "
-#~ "uniti"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Copia i loro elementi selezionati prima del primo elemento selezionato "
-#~ "nella lista degli elementi uniti"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Sposta in su gli elementi selezionati di una posizione"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Copia i miei elementi selezionati dopo il primo elemento selezionato "
-#~ "nella lista degli elementi uniti"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copia i loro elementi selezionati alla fine della lista degli elementi "
-#~ "uniti"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Sposta in giù le voci selezionate di una posizione"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Clicca <strong>{0}</strong> per terminare l'unione tra le voci "
-#~ "personali e le loro</html>"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Clicca <strong>{0}</strong> per iniziare l'unione tra le voci "
-#~ "personali e le loro</html>"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Blocca la lista attuale degli elementi uniti"
-
-#~ msgid "argument \"adjustable\" must not be null"
-#~ msgstr "l'argomento \"adjustable\" non deve essere nullo"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "indice di colonna non atteso. Ottenuto {0}"
-
-#~ msgid "argument \"view\" must not be null"
-#~ msgstr "l'argomento \"view\" non deve essere nullo"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "adjustable {0} non ancora registrato"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "adjustable {0} non ancora registrato. Non è possibile impostare la "
-#~ "partecipazione nella regolazione sincronizzata"
-
-#~ msgid "parameter \"my\" most not be null"
-#~ msgstr "il parametro \"my\" non deve essere nullo"
-
-#~ msgid "parameter \"their\" must not be null"
-#~ msgstr "il parametro \"their\" non deve essere nullo"
-
-#~ msgid "parameter \"way\" must not be null"
-#~ msgstr "il parametro \"way\" non deve essere nullo"
-
-#~ msgid "parameter 'key' must not be null"
-#~ msgstr "il parametro 'key' non deve essere nullo"
-
-#~ msgid "parameter 'my' must not be null"
-#~ msgstr "il parametro 'my' non deve essere null"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "nodi uniti non ancora bloccati. Non è possibile costruire il comando di "
-#~ "risoluzione"
-
-#~ msgid "parameter way must not be null"
-#~ msgstr "il parametro way non deve essere nullo"
-
-#~ msgid "parameter their must not be null"
-#~ msgstr "il parametro their non deve essere nullo"
-
-#~ msgid "parameter my most not be null"
-#~ msgstr "il parametro my non deve essere nullo"
-
-#~ msgid "parameter 'their' must not be null"
-#~ msgstr "il parametro 'their' non deve essere null"
-
-#~ msgid "argument 'decision' must not be null"
-#~ msgstr "l'argomento 'decision' non deve essere null"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Applica risoluzioni parziali"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "il parametro '{0}' non deve essere nullo"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "non è possibile risolvere il conflitto irrisolto"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr ""
-#~ "ATTENZIONE: valore inaspettato per la preferenza sulla risoluzione del "
-#~ "conflitto, ottenuto "
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "E' stata raggiunta la fine della linea"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Selezionare un nodo iniziale alla fine di un percorso"
-
-#~ msgid "Reached a junction"
-#~ msgstr "E' stato raggiunto un incrocio"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "L'estensione {0} è stata scaricata con successo. Riavviare JOSM."
-#~ msgstr[1] ""
-#~ "Le estensioni {0} sono state scaricate con successo. Riavviare JOSM."
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM."
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Non si è finito di risolvere tutti i conflitti.<br>Cliccare <strong>"
-#~ "{0}</strong> per applicare lo stesso i conflitti già risolti.<br>Si "
-#~ "possono risolvere successivamente i conflitti restanti.<br>Cliccare "
-#~ "<strong>{1}</strong> per ritornare alla risoluzione dei conflitti.</html>"
-
-#~ msgid ""
-#~ "Properties in the merged element. They will replace properties in my "
-#~ "elements when  merge decisions are applied."
-#~ msgstr ""
-#~ "Proprietà nell'elemento unito. Queste sostituiranno le proprietà presenti "
-#~ "negli elementi personali non appena saranno applicate le decisioni "
-#~ "sull'unione."
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "non è possibile marcare come irrisolto l'elemento oggetto di unione"
-
-#~ msgid "Uploading"
-#~ msgstr "Invio in corso"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because the server has a newer "
-#~ "version of one<br>of your nodes, ways or relations.<br>The conflict is "
-#~ "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-#~ "server has version {2}, your version is {3}.<br>Please synchronize your "
-#~ "local dataset using <br><strong>File-&gt;Update Data</strong>, "
-#~ "resolve<br>any conflicts and try to upload again.</html>"
-#~ msgstr ""
-#~ "<html>L''invio è <strong>fallito</strong> perché il server ha a "
-#~ "disposizione una versione più recente di uno<br>dei tuoi nodi, percorsi o "
-#~ "relazioni.<br>Il conflitto è stato causato da <strong>{0}</strong> con "
-#~ "identificativo <strong>{1}</strong>,<br>il server ha la versione {2}, la "
-#~ "tua versione è {3}.<br>Si prega di sincronizzare l'insieme di dati locale "
-#~ "utilizzando<br><strong>File-&gt;Aggiorna dati</strong>, di risolvere<br>i "
-#~ "vari conflitti e di riprovare a caricare.</html>"
-
-#~ msgid ""
-#~ "<html>Uploading failed because the server has a newer version of "
-#~ "one<br>of your nodes, ways or relations.<br>Please synchronize your local "
-#~ "dataset using <br><strong>File-&gt;Update Data</strong>, resolve<br>any "
-#~ "conflicts and try to upload again.</html>"
-#~ msgstr ""
-#~ "<html>L'invio è fallito perché il server ha a disposizione una versione "
-#~ "più recente di uno<br>dei tuoi nodi, percorsi o relazioni.<br>Si prega di "
-#~ "sincronizzare l'insieme di dati locale utilizzando<br><strong>File-&gt;"
-#~ "Aggiorna dati</strong>, di risolvere<br>i vari conflitti e di riprovare a "
-#~ "caricare.</html>"
-
-#~ msgid "preference {0} missing. Can't initialize OsmApi"
-#~ msgstr "preferenza {0} mancante. Impossibile inizializzare OsmApi"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Invio alle API di OSM fallito"
-
-#~ msgid ""
-#~ "WARNING: preference '{0}' or api version {1} of dataset requires to use "
-#~ "changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "ATTENZIONE: la preferenza '{0}' o la versione {1} delle api dell'insieme "
-#~ "di dati richiede l'utilizzo dei gruppi di modifiche, ma le API non li "
-#~ "gestiscono. I gruppi di modifiche saranno ignorati."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Ripristino relazione..."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Si, ripristina anche questo"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Ripristino via"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "La proiezione non può essere letta dalle preferenze. Verrà utilizzata "
-#~ "quella di Mercatore"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Ci sono {0} nodi aggiuntivi usati dalla via {1}<br>che sono stati "
-#~ "cancellati sul server.<br><br>Vuoi recuperare anche questi nodi?</html>"
-
-#~ msgid "Update Selection"
-#~ msgstr "Aggiorna la selezione"
-
-#~ msgid "Update failed"
-#~ msgstr "Aggiornamento fallito"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "Valore di ritorno inatteso. Ottenuto {0}"
-
-#~ msgid "Selection too big"
-#~ msgstr "Selezione troppo grande"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Rilevato un conflitto"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Errore durante la comunicazione con il server"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Errore durante la comunicazione con il server."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Inizializzazione delle API fallita"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitiva mancante"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "E' fallito il tentativo di aggiornare le primitive selezionate."
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Aggiorna le primitive attualmente selezionate dal server"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento."
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Sincronizza solamente {0} {1}"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Aggiornamento della primitiva"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiva già eliminata"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Ripristina {0} primitive"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Primitive eliminate o spostate"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "rimozione del riferimento dalla relazione {0}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "rimozione del riferimento dal percorso {0}"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr ""
-#~ "Sono stati generati i seguenti errori durante lo scaricamento di massa:"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Non c'è alcuna versione valida alla data ''{0}'' in questo storico"
-
-#~ msgid "changeset"
-#~ msgstr "gruppo di modifiche"
-
-#~ msgid "changesets"
-#~ msgstr "gruppi di modifiche"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "non c'è alcuna primitiva con versione {0} in questo storico"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Comunicazione con il server fallita"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Ripristina i nodi addizionali?"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Mantieni il mio stato visibile"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Ripristina le primitive dipendenti?"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "non visibile (sul server)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visibile (sul server)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Stato visibile:"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Mantieni un clone della versione locale"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Storico per {0} {1}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Visualizza lo storico della primitiva selezionata"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Caricamento dello storico per {0} con id {1}"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "Nome utente OSM (e-mail)"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "Importazione TangoGPS fallita!"
-
-#~ msgid "image loading..."
-#~ msgstr "caricamento immagine..."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Il numero di cambiamenti corrente supera il numero massimo consentito, "
-#~ "ora sono {0}, il massimo è {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure "
-#~ "<A HREF=\"{1}\">nella propria lingua</A>."
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "L'appartenenza ad una relazione è stata copiata su tutti i nuovi "
-#~ "percorsi.\n"
-#~ "Verificare e correggere dove necessario."
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Non è possibile trovare la primitiva con identificativo {0} nell'insieme "
-#~ "di dati locale corrente"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Eliminazione di 1 primitiva"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>E'' stato generato un errore durante la comunicazione con il "
-#~ "server<br>Dettagli: {0}</html>"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "Zona UTM {0}"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Per mantenere la propria versione locale, JOSM<br>deve reimpostare "
-#~ "l''identificativo di {0} {1} a 0.<br>Al prossimo caricamento il server "
-#~ "assegnerà ad esso<br>un nuovo identificativo.<br>Si è d'accordo?</html>"
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Il livello {0} deve essere presente nella lista dei livelli"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>E'' fallito il caricamento dello storico dal server. Dettagli:<br>"
-#~ "{0}</html>"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong> da "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Predefiniti (vedere il suggerimento per informazioni dettagliate)"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copia predefiniti"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Aggiungi una nuova sorgente XML alla lista."
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Si sono mossi più di {0} elementi. Muovere un grande numero di elementi è "
-#~ "spesso dovuto ad un errore.\n"
-#~ "Si è sicuri di volerli muovere?"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Ruota {0} {1}"
-
-#~ msgid "Main.ds doesn't include node {0}"
-#~ msgstr "Main.ds non include il nodo {0}"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr ""
-#~ "storico non ancora inizializzato. E' fallito il tentativo di impostare la "
-#~ "primitiva corrente."
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Si possono aggiungere, modificare ed eliminare elementi WMS nella scheda "
-#~ "delle preferenze di WMSplugin - questi verranno visualizzati nel menu "
-#~ "WMS.\n"
-#~ "\n"
-#~ "Si possono anche aggiungere manualmente nelle Preferenze Avenzate, "
-#~ "utilizzando il seguente 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"
-#~ "Esempio di indirizzo URL completo di WMS (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Per il Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , è "
-#~ "solo necessario inserire l'identificativo rilevante.\n"
-#~ "Per aggiungere una voce di menu Metacarta Map Rectifier, creare "
-#~ "manualmente l'indirizzo URL come in questo esempio, sostituendo 73 con "
-#~ "l'identificativo della propria immagine:\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"
-#~ "Nota: Assicurarsi che l'immagine sia conforme, con un diritto d'autore "
-#~ "ragionevole, e, se non si è sicuri, non utilizzarla."
-
-#~ msgid "Unnamed Junction"
-#~ msgstr "incrocio senza nome"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "E' fallita l'apertura della connessione alle API {0}"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>L'estensione openstreetbus sta utilizzando il vecchio server "
-#~ "appspot.com.<br>E' disponibile un nuovo server su schokokeks.org.<br>Si "
-#~ "vuole migrare al nuovo server? (Fortemente consigliato)</html>"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Il server ha risposto con il codice 404, ritento con una richiesta per "
-#~ "ogni singola primitiva"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "attributo obbligatorio ''{0}'' mancante"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Nome di accesso (e-mail) al profilo OSM."
-
-#~ msgid "Used style"
-#~ msgstr "Stile usato"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Ordina i membri della relazione selezionata o l'intera lista"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Membri: {0} (collegato: {1})"
-
-#~ msgid "History item"
-#~ msgstr "Elemento dello storico"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr ""
-#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione "
-#~ "di {0}."
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Si, elimina"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Mantieni il loro stato visibile"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "indice fuori dai limiti Ottenuto {0}"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "ATTENZIONE: formato inatteso per l' URL di base delle API. Il "
-#~ "reindirizzamento della pagina della storia delle primitive di OSM "
-#~ "probabilmente non funzionerà. L' URL di base per le api è: {0}"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "La lunghezza del valore del tag \"{0}\" sulla primitiva {1} eccede la "
-#~ "massima lunghezza ammessa {2}. La lunghezza del valore è {3}"
-
-#~ msgid "No data"
-#~ msgstr "Nessun dato"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime "
-#~ "{0} delle {1} primitive selezionate"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Attenzione: troncamento automatico del valore del tag {0} sulla primitiva "
-#~ "cancellata {1}"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Cambiare {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Aggiungere {0} {1}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più "
-#~ "disponibile"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Rimuovere il membro della relazione {0} {1}"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Upload <strong>fallito</strong> poiché una delle primitive che hai "
-#~ "cercato di cancellare<br>dal server era già stata eliminata.<br><br>Il "
-#~ "messaggio di errore è:<br>{0}</html>"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Upload <strong>fallito</strong>.<br>{0}</html>"
-
-#~ msgid "image "
-#~ msgstr "immagine "
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo long, "
-#~ "ricevuto ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo long (>=0), "
-#~ "ricevuto ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, "
-#~ "ricevuto ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), "
-#~ "ricevuto ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo booleano, "
-#~ "ricevuto ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo "
-#~ "OsmPrimitiveType, ricevuto ''{1}''"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Il server ha restituito un errore con codice {0}"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare OsmApi"
-
-#~ msgid "Icon paths"
-#~ msgstr "Percorso Icone"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflitto nei dati"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geografico"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Scarica riferimenti da OSM..."
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Scarica le primitive che hanno come riferimento una delle primitive "
-#~ "selezionate"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflitti durante lo scaricamento"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Scarica riferimenti..."
-
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "E'' fallito il tentativo di accedere alla proprietà di sistema ''{0}'' "
-#~ "per ragioni di sicurezza. L''eccezione è stata: {1}"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Estensione del file sconosciuta per il file ''{0}''"
-
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr ""
-#~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Unisci le primitive attualmente selezionate con un altro livello"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Impossibile leggere il file ''{0}''. L''errore è: <br>{1}</html>"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr ""
-#~ "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato."
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Attenzione: è fallito il tentativo di accedere alla cartella ''{0}'' per "
-#~ "ragioni di sicurezza. L''eccezione è stata: {1}"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "L''estensione non può essere rimossa. Probabilmente è stata già "
-#~ "disabilitata"
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "E'' stato richiesto il caricamento dell''estensione {0}. Questa "
-#~ "estensione non è più necessaria."
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Seleziona il livello WMS"
-
-#~ msgid "Confirmation"
-#~ msgstr "Conferma"
-
-#~ msgid "Delete all"
-#~ msgstr "Elimina tutto"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "elimina le etichette correntemente selezionate"
-
-#~ msgid "No, don't apply"
-#~ msgstr "No, non applicare"
-
-#~ msgid "Linked"
-#~ msgstr "Collegato"
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Imposta le coordinate di Lambert"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Selezionare il livello WMS da regolare."
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Regola la posizione del livello WMS selezionato"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Abilitare per caricare tutte le modifiche in una sola richiesta, "
-#~ "disabilitare per utilizzare una richiesta per ogni singola primitiva "
-#~ "modificata"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "carica tutte le modifiche in una sola richiesta"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Impossibile leggere il file ''{0}''.<br> Errore: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Ci sono dei cambiamenti non salvati nel layer {0}. Ignorare i cambiamenti "
-#~ "e continuare?"
-#~ msgstr[1] ""
-#~ "Ci sono dei cambiamenti non salvati nei layer {0}. Ignorare i cambiamenti "
-#~ "e continuare?"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Attualmente non ci sono changeset aperti."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Chiude il changeset corrente"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Chiude il changeset corrente ..."
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Usare un nuovo changset a chiuderlo."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr ""
-#~ "<html>Ci sono conflitti non risolti sul layer ''{0}''.<br>Prima devi "
-#~ "risolverli.<html>"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Usare un nuovo changset e lasciarlo aperto"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "Selezionare per caricare i dati usando un nuovo changeset e per chiudere "
-#~ "il changeset dopo il caricamento"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Non è stata trovata nessuna primitiva con id {0} nel dataset currente"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Selezionare per caricare i dati usando un nuovo changeset e per chiudere "
-#~ "il changeset dopo il caricamento"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure "
-#~ "<A HREF=\"{1}\">nella propria lingua</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più "
-#~ "disponibile"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Pagina di aiuto mancante. crearla in <A HREF=\"{0}\">italiano</A> oppure "
-#~ "<A HREF=\"{1}\">la propria lingua</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "Valore di ritorno inatteso. Ottenuto {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "non c'è alcuna primitiva con versione {0} in questo storico"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Non c'è alcuna versione valida alla data ''{0}'' in questo storico"
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parametro attualmente fuori scala: ottenuto {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "L'unione dei nodi non è stata ancora bloccata. Non è possibile costruire "
-#~ "il comando di risoluzione"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "indice di colonna non atteso. Ottenuto {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "indice fuori dai limiti Ottenuto {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Visualizza lo storico della primitiva selezionata"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Impossibile leggere \"{0}\""
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Il server ha risposto con il codice 404, ritento con una richiesta per "
-#~ "ogni singola primitiva"
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "preferenza ''{0}'' mancante. Impossibile inizializzare OsmApi"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int, "
-#~ "ricevuto ''{1}''"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "valore non valido per attributo obbligatorio ''{0}'' di tipo int (>=0), "
-#~ "ricevuto ''{1}''"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Impossibile connettersi al server osm. Controllare la propria connessione "
-#~ "ad internet."
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Inserire una stringa di filtro."
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr ""
-#~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
-#~ "percorso unito"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Caricamento <strong>fallito</strong> a causa dell''utilizzo<br>del "
-#~ "gruppo di modifiche {0} che era già stato chiuso a {1}.<br>Caricare "
-#~ "nuovamente con un gruppo di modifiche nuovo o esistente aperto.</html>"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr ""
-#~ "Non è stato trovato niente nella selezione durante la ricerca di "
-#~ "''''{0}''''"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Risolvi i conflitti di versione per la relazione {0}"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Risolvi i conflitti di versione per il percorso {0}"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Risolvi i conflitti di versione per il nodo {0}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Era atteso ID >= 0. Ottenuto {0}."
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "Una primitiva con ID = 0 non può essere invisibile."
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "nota: Per alcune funzionalità JOSM ha bisogno di molta memoria. Può "
-#~ "essere necessario aggiungere la seguente\n"
-#~ "      opzione Java per incrementare la dimensione massima della memoria "
-#~ "allocata"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Selezionare quali valori mantenere"
-
-#~ msgid "Tag modified relations with   "
-#~ msgstr "Etichette modificate assieme alle relazioni   "
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Conflitti durante l''unione dei nodi - il nodo unito è ''''{0}''''"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Applica anche ai figli"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Seleziona le primitive caricate da questo utente"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Più membri fanno riferimento alla stessa primitiva"
-
-#~ msgid "white"
-#~ msgstr "bianco"
-
-#~ msgid "blue"
-#~ msgstr "blu"
-
-#~ msgid "brown"
-#~ msgstr "marrone"
-
-#~ msgid "red"
-#~ msgstr "rosso"
-
-#~ msgid "black"
-#~ msgstr "nero"
-
-#~ msgid "Travel"
-#~ msgstr "Viaggio"
-
-#~ msgid "Bikes"
-#~ msgstr "Biciclette"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Il livello ''{0}'' possiede già un conflitto per la "
-#~ "primitiva<br>''{1}''.<br>Questo conflitto non può essere aggiunto.</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
-#~ "{2}.<br>Eliminare dalla relazione?</html>"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Attenzione: l'intestazione dell'errore {0} non coincideva con lo schema "
-#~ "atteso \"{1}\""
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr ""
-#~ "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso "
-#~ "\"{1}\""
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Attenzione: Il livello ''{0}'' non esiste più. Non è possibile rimuovere "
-#~ "il conflitto per la primitiva ''{1}''."
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
-#~ "<br>Eliminare dalla relazione?</html>"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Sposta sempre e non visualizzare più la finestra di dialogo"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati."
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "La collezione di etichette non può essere applicata ad una primitiva "
-#~ "perché ci sono chiavi con valori multipli."
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.."
-#~ "{1}. Ottenuto ''{2}''."
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "il parametro ''{0}'' non deve essere vuoto."
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto."
-
-#~ msgid "Save and Delete"
-#~ msgstr "Salva ed elimina"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "tracciato"
-#~ msgstr[1] "tracciati"
-
-#~ msgid "Update selections"
-#~ msgstr "Aggiorna le selezioni"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr ""
-#~ "Aggiorna gli oggetti nel livello corrente dei dati prelevandoli dal "
-#~ "server."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Carica tutte le modifiche nel livello corrente dei dati sul server OSM"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "a {0} primitiva"
-#~ msgstr[1] "a {0} primitive"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr ""
-#~ "({0}/{1}) Caricamento degli elementi da cui dipende la primitiva {2}"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Si è in procinto di avviare {0} finestre del browser.<br>Questa "
-#~ "operazione potrebbe riempire lo schermo con le finestre del browser<br>e "
-#~ "metterci un po' di tempo."
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr ""
-#~ "Carica tutte le modifiche apportate alla selezione corrente sul server "
-#~ "OSM."
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. "
-#~ "Ignorare questa primitiva e riprovare a caricare."
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr ""
-#~ "Sono stati generati i seguenti errori durante lo scaricamento massivo:{0}"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Ci sono {0} primitive nel proprio insieme di dati locale "
-#~ "che<br>dovrebbero essere state eliminate sul server. Se si tentasse "
-#~ "successivamente di eliminarle o<br>aggiornarle è probabile che il server "
-#~ "segnali<br>un conflitto.<br><br>Cliccare <strong>{1}</strong> per "
-#~ "verificare lo stato di queste primitive<br>sul server.<br>Cliccare "
-#~ "<strong>{2}</strong> per ignorare.<br></html>"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relazioni sono in rapporto ciclico perché ognuna si riferisce "
-#~ "all'altra.<br>JOSM non può caricarle. Modificare le relazioni e rimuovere "
-#~ "la dipendenza ciclica.</html>"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è "
-#~ "più presente"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Rimozione del riferimento dalla relazione {0}"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Epurato oggetto ''{0}''"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Attenzione: epurazione del percorso {0} perché il numero dei nodi è "
-#~ "inferiore a 2. Al momento è {1}"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Epurati {0} oggetti"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Attenzione: è fallita l''inizializzazione delle preferenze. La cartella "
-#~ "delle preferenze ''{0}'' non è in realtà una cartella."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Fallita l''inizializzazione delle preferenze.<br>La cartella delle "
-#~ "preferenze ''{0}'' non è in realtà una cartella.</html>"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Fallito il caricamento dei segnalibri da ''{0}'' per ragioni di "
-#~ "sicurezza. L''errore è stato: {1}"
-
-#~ msgid "Text"
-#~ msgstr "Testo"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "Nessun tipo trovato. Lo storico è vuoto."
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0} "
-#~ "e versione {1}"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr ""
-#~ "In questo insieme di dati non è stata trovata alcuna primitiva con id {0}"
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "Impossibile confrontare la primitiva avente ID ''{0}'' con la primitiva "
-#~ "avente ID ''{1}''."
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "La mia primitiva con id {0} e versione {1} è visibile sebbene la loro "
-#~ "primitiva con versione minore {2} non lo sia. Non si può sopperire a "
-#~ "questa inconsistenza. Verrà mantenuta la mia primitiva. "
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Impossibile scrivere il segnalibro.<br>{0}</html>"
-
-#~ msgid "line"
-#~ msgstr "linea"
-
-#~ msgid "minor_line"
-#~ msgstr "linea minore"
-
-#~ msgid "tower"
-#~ msgstr "traliccio"
-
-#~ msgid "overground"
-#~ msgstr "sopra il suolo"
-
-#~ msgid "underwater"
-#~ msgstr "subacqueo"
-
-#~ msgid "any substance"
-#~ msgstr "qualunque sostanza"
-
-#~ msgid "Man-Made"
-#~ msgstr "Artificiale"
-
-#~ msgid "autoload tiles"
-#~ msgstr "carica automaticamente i tasselli"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copia il predefinito selezionato"
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr ""
-#~ "Raggruppa gli inserimenti delle interpolazioni degli indirizzi in una "
-#~ "finestra unica,"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>L''indirizzo URL di base<br>''{0}''<br>per questo livello WMS non "
-#~ "termina con ''&'' e neanche con ''?''.<br>Questo probabilmente causerà "
-#~ "delle richieste WMS non valide. Si dovrebbero verificare le<br>proprie "
-#~ "impostazioni.<br>Si vuole comunque procedere al prelevamento dei tasselli "
-#~ "WMS?"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Questo controllo verifica che non ci siano percorsi con le stesse "
-#~ "etichette e le stesse coordinate dei nodi."
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Attenzione: l''indirizzo URL ''{0}'' per un servizio WMS non termina con "
-#~ "''&'' o ''?''."
-
-#~ msgid "create new objects"
-#~ msgstr "crea nuovi oggetti"
-
-#~ msgid "Relation: from {0} to {1} via {2}"
-#~ msgstr "Relazione: da {0} a {1} tramite {2}"
-
-#~ msgid "Processing {0}"
-#~ msgstr "Elaborazione {0}"
-
-#~ msgid "{0} extrem nodes."
-#~ msgstr "{0} nodi estremi."
-
-#~ msgid "Via node {0}, {1}"
-#~ msgstr "Tramite nodo {0}, {1}"
-
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} nodi intermedi."
-
-#~ msgid "MIddle way: {0}"
-#~ msgstr "Percorso intermedio: {0}"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Ci sono {0} primitive addizionali collegate alla relazione {1}"
-#~ "<br>che sono state eliminate sul server.<br><br>Si desidera ripristinarle?"
-#~ "</html>"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Nodi uniti non ancora bloccati. Non è possibile costruire il comando di "
-#~ "risoluzione"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Per mantenere la propria versione locale, JOSM<br>deve ripristinare "
-#~ "l''identificativo della primitiva {0} a 0.<br>Al prossimo caricamento il "
-#~ "server le assegnerà<br>un nuovo identificativo.<br>Si è d''accordo?</html>"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr ""
-#~ "La collezione di etichette non include il valore selezionato ''''{0}''''."
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Finestra non ancora creata. Invocare prima createInstance()"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Inserire un commento per questo insieme di modifiche (min. 3 caratteri)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Commento non valido"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} oggetto da modificare:"
-#~ msgstr[1] "{0} oggetti da modificare:"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Apri un nuovo insieme di modifiche"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Carica tutte le modifiche in una sola richiesta"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Carica i dati su un insieme di modifiche già aperto"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Utilizza un insieme di modifiche aperto"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Preparazione delle primitive da caricare ..."
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr ""
-#~ "Errore: fallita l'aggiunta delle credenziali di autenticazione alla "
-#~ "connessione."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Attenzione: fallito il ripristino della geometria della finestra dalla "
-#~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
-#~ msgstr ""
-#~ "La preferenza con chiave ''''{0}'''' non include ''''{1}''''. Non è "
-#~ "possibile ripristinare la geometria della finestra dalle preferenze."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "La preferenza con chiave ''''{0}'''' non fornisce un valore intero per "
-#~ "''''{1}''''. Ottenuto {2}. Non è possibile ripristinare la geometria "
-#~ "della finestra dalle preferenze."
-
-#~ msgid ""
-#~ "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "Non è stato possibile analizzare il campo ''''{1}'''' nella preferenza "
-#~ "con chiave ''''{0}''''. L''eccezione è stata: {2}. Non è possibile "
-#~ "ripristinare la geometria della finestra dalle preferenze."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "La preferenza con chiave ''''{0}'''' non esiste. Non è possibile "
-#~ "ripristinare la geometria della finestra dalle preferenze."
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Fallita la chiusura dell''insieme di modifiche ''''{0}'''' sul "
-#~ "server OSM ''''{1}''''.<br>L''insieme di modifiche sarà automaticamente "
-#~ "chiuso dal server dopo un intervallo massimo di attesa.</html>"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Fallita l''apertura della connessione al server "
-#~ "remoto<br>''''{0}''''<br>per ragioni di sicurezza. Solitamente è dovuto "
-#~ "al fatto che si sta eseguendo<br>una applet e perché l''applet non è "
-#~ "stata caricata da ''''{1}''''.</html>"
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn''t know about an object<br>you tried to "
-#~ "read, update, or delete. Either the respective object<br>doesn''t exist "
-#~ "on the server or you''re using an invalid URL to access<br>it. Please "
-#~ "carefully check the servers address ''{0}'' for typos."
-#~ msgstr ""
-#~ "Il server OSM ''''{0}'''' non è a conoscenza di un oggetto<br>che si è "
-#~ "tentato di leggere, aggiornare o eliminare. O questo oggetto non "
-#~ "esiste<br>sul server oppure si sta utilizzando un indirizzo URL non "
-#~ "valido per accedere<br>ad esso. Controllare attentamente l''indirizzo del "
-#~ "server ''''{0}'''' per identificare eventuali errori di battitura."
-
-#~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to "
-#~ "version 0.6"
-#~ msgstr ""
-#~ "ATTENZIONE: non è definita alcuna versione delle API per i dati da "
-#~ "caricare. Ritorno alla versione 0.6"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "ATTENZIONE: la preferenza ''''{0}'''' o la versione delle API ''''{1}'''' "
-#~ "dell''insieme dei dati richiedono l''utilizzo dei caricamenti "
-#~ "differenziali, ma le API non sono in grado di gestirli. Ignorato il "
-#~ "caricamento differenziale."
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr ""
-#~ "Tipo di membro di relazione ''''{0}'''' sconosciuto nella relazione con "
-#~ "ID esterno ''''{1}''''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Era attesa una istanza di OsmDataLayer. Ottenuto ''{0}''."
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "E'' stato marcato come incompleto il percorso {0} con {1} nodi perché "
-#~ "manca almeno un nodo nei dati caricati."
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr ""
-#~ "Valore numerico non valido per l''attributo ''''{0}''''. Ottenuto "
-#~ "''''{1}''''."
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr ""
-#~ "L'insieme di modifiche corrente è nullo. Non si possono caricare i dati."
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "Nessuna primitiva con {0} nell''insieme di dati locale. Non è possibile "
-#~ "dedurre il tipo di primitiva."
-
-#~ msgid ""
-#~ "Please consult the Conflict List Dialog<br>and manually resolve them."
-#~ msgstr ""
-#~ "Consultare la finestra con la lista dei conflitti<br>e risolverli "
-#~ "manualmente."
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} oggetto è stato epurato dall''insieme di dati locale perché risulta "
-#~ "eliminato dal server."
-#~ msgstr[1] ""
-#~ "{0} oggetti sono stati epurati dall''insieme di dati locale perché "
-#~ "risultano eliminati dal server."
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} livello ha la necessità di essere salvato ma possiede un file "
-#~ "associato<br>che non può essere scritto.<br>Selezionare un altro file per "
-#~ "questo livello oppure scartare le modifiche.<br>Livello con un file non-"
-#~ "scrivibile:</html>"
-#~ msgstr[1] ""
-#~ "<html>{0} livelli hanno la necessità di essere salvati ma posseggono dei "
-#~ "file associati<br>che non possono essere scritti.<br>Selezionare un altro "
-#~ "file per ognuno di essi oppure scartare le modifiche.<br>Livelli con file "
-#~ "non-scrivibili:</html>"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
 #~ "Attenzione: eccezione ignorata perché il lavoro è stato annullato. "
-#~ "L'eccezione è stata: "
+#~ "Eccezione: {0}"
 
 #~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "<b>Ingrandimento:</b> rotellina del mouse, doppio click oppure Ctrl + Su/"
-#~ "giu <b>Spostamento della mappa:</b> tenere premuto il tasto destro del "
-#~ "mouse, muovere il mouse o utilizzare i tasti cursore. <b>Selezione:</b> "
-#~ "tenere premuto il tasto sinistro del mouse e disegnare un riquadro."
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
+#~ "Attenzione: eccezione ignorata perché il lavoro è stato annullato. "
+#~ "Eccezione: {0}"
 
 #~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "<html>Il livello ''''{0}'''' contiene già un conflitto per la "
-#~ "primitiva<br>''''{1}''''.<br>Risolvere prima questo conflitto e quindi "
-#~ "riprovare.</html>"
+#~ "Attenzione: numero di versione JOSM non previsto nel file di revisione, "
+#~ "il valore è ''''{0}''''"
 
 #~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "<html>Si sta impostando un ruolo vuoto su {0} primitive.<br>Questo è "
-#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si "
-#~ "desidera veramente applicare il nuovo ruolo?</html>"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Seleziona le primitive per i membri della relazione selezionata"
+#~ "Attenzione: è fallita l''apertura del flusso di entrata per la risorsa "
+#~ "''''/data/{0}''''. Impossibile caricare la griglia NTF<->RGF93"
 
 #~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "<html>Questa relazione è stata modificata fuori dall'editor.<br>Non si "
-#~ "possono applicare le proprie modifiche e continuare a modificare."
-#~ "<br><br>Si desidera creare un conflitto e chiudere l'editor?</html>"
+#~ "<html>Sono necessari <strong>più gruppi di modifiche</strong> per poter "
+#~ "caricare {0} oggetti. Quale strategia si desidera utilizzare?</html>"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr ""
+#~ "Il prologo del documento OsmChange non è stato ancora scritto. Si prega "
+#~ "di scriverlo prima."
 
 #~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Seleziona i membri della relazione a cui si riferiscono {0} primitive "
-#~ "nella selezione corrente"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr ""
-#~ "Sposta la vista sulla primitiva a cui si riferisce il primo membro "
-#~ "selezionato"
+#~ "E'' stato generato un errore durante l''analisi del file gpx {0}. Sarà "
+#~ "disponibile solamente parte del file"
 
 #~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Questa relazione contiene già uno o più membri che si "
-#~ "riferiscono<br>alla primitiva ''''{0}''''<br><br>Si desidera realmente "
-#~ "aggiungere un altro membro alla relazione?</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Seleziona i membri della relazione che si riferiscono alle primitive "
-#~ "nella selezione corrente"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Rimuovi tutti i membri che si riferiscono ad una delle primitive "
-#~ "selezionate"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>Fallita la creazione di un indirizzo URL perché su questo sistema "
-#~ "manca la codifica ''''{0}''''.</html>"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>La relazione figlia<br>{0}<br>risulta eliminata sul server. Non può "
-#~ "essere caricata"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "Era atteso il parametro ''''{0}'''' con etichette per una sola chiave. "
-#~ "Ottenuto {1}."
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Nell''insieme di dati corrente non è stato trovato un oggetto con id {0}"
-
-#~ msgid "Failed to read command. Exiting help browser. Exception was:"
-#~ msgstr ""
-#~ "Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione "
-#~ "è stata:"
-
-#~ msgid "Failed to launch the external help browser"
-#~ msgstr "Fallita l'apertura del browser esterno di aiuto"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Inserire un commento al caricamento (min. 3 caratteri)"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
-
-#~ msgid ""
-#~ "Plugin {0} version {1} found but for this version of JOSM is at least "
-#~ "version {2} required. Please update the plugin."
-#~ msgstr ""
-#~ "E'' stata trovata la versione {1} dell''estensione {0} ma per questa "
-#~ "versione di JOSM è richiesta almeno la versione {2}. Aggiornare "
-#~ "l''estensione."
-
-#~ msgid ""
-#~ "<html>The server reported that it has detected a conflict.<br>Error "
-#~ "message (untranslated):<br>{0}"
-#~ msgstr ""
-#~ "<html>Il server riporta che è stato trovato un conflitto.<br>Messaggio "
-#~ "d''errore (non tradotto):<br>{0}"
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>E'' stato richiesto il caricamento dell''estensione {0}.<br>Questa "
-#~ "estensione non è più mantenuta e molto probabilmente produrrà degli "
-#~ "errori.<br>Dovrebbe essere disabilitata.<br>Rimuovere dalle preferenze?</"
-#~ "html>"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Il multi-poligono deve consistere solamente in percorsi chiusi."
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Crea i multi-poligoni con un solo click, in modo più semplice rispetto al "
-#~ "tradizionale editor delle relazioni."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Selezionare almeno due percorsi."
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Variazione {0} non ancora registrata. Non è possibile impostare la "
-#~ "partecipazione nella variazione sincronizzata."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ATTENZIONE: La password viene memorizzata in chiaro nel file di "
-#~ "configurazione.<br>La password è trasmessa in chiaro al server, "
-#~ "codificata all'interno dell'indirizzo URL.<br><b>Non usare una password "
-#~ "importante.</b></html>"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Username del server proxy"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Era richiesto un Id > 0, ottenuto {0}"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "L''estensione {0} è richiesta dall''estensione {1}, ma non è stata "
-#~ "trovata."
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Aggiunti {0} oggetti"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url {0}."
-#~ "<br>Tipicamente questo è dovuto a qualche problema di rete, controllare "
-#~ "la propria<br>connessione ad internet</html>"
-
-#~ msgid "Set manually the Lambert zone"
-#~ msgstr "Imposta manualmente la zona di Lambert"
-
-#~ msgid "gray"
-#~ msgstr "grigio"
-
-#~ msgid ""
-#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
-#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n"
-#~ "Upload your changes, close all layers and change\n"
-#~ "manually the Lambert zone from the Cadastre menu"
-#~ msgstr ""
-#~ "Il livello corrente è all''interno della zona di Lambert CC9 \"{0}\"\n"
-#~ "dove il comune è all''interno della zona di Lambert CC9 \"{1}\".\n"
-#~ "Caricare le proprie modifiche, chiudere tutti i livelli e cambiare\n"
-#~ "manualmente la zona di Lambert dal menu Cadastre"
-
-#~ msgid "Warning: bad location in HTML document. Exception was: "
-#~ msgstr ""
-#~ "Attenzione: posizione errata nel documento HTML. L'eccezione è stata: "
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information.You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Manca il contenuto per questo argomento "
-#~ "di aiuto</p><p class=\"warning-body\">Il contenuto per l''argomento di "
-#~ "aiuto <strong>{0}</strong> non è ancora disponibile. Manca per la propria "
-#~ "lingua locale ({1}) e anche per la lingua inglese.<br><br>Aiutateci a "
-#~ "migliorare il sistema di aiuto JOSM e a inserire le informazioni "
-#~ "mancanti. Si può modificare l''argomento di aiuto <a href=\"{2}\">nella "
-#~ "propria lingua locale ({1})</a> oppure <a href=\"{3}\">nella lingua "
-#~ "inglese</a>.</p></html>"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Conflitto irrisolto tra stati di visibilità"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Caricamento di {0} oggetti ..."
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Valore in doppia precisione ''''{0}'''' non valido"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr ""
-#~ "Erano attesi esattamente quattro numeri in doppia precisione nella "
-#~ "stringa, ottenuto {0}"
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Area di scarico corrente</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "La stringa ''''{0}'''' non è un valore in doppia precisione valido."
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Né <strong>{0}</strong> né <strong>{1}</strong> sono abilitati."
-#~ "<br>Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi."
-#~ "</html>"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Stili disponibili (da {0})"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Aggiungi un nome di file o un indirizzo URL di uno stile attivo"
-
-#~ msgid "Active styles"
-#~ msgstr "Stili attivi"
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
-#~ msgstr ""
-#~ "E' stato aggiornato il proprio programma JOSM.\n"
-#~ "Per prevenire alcuni problemi le estensioni dovrebbero aggiornate di "
-#~ "conseguenza.\n"
-#~ "Aggiornare le estensioni adesso?"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} Estensione scaricata con successo."
-#~ msgstr[1] "{0} Estensioni scaricate con successo."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Riavviare JOSM."
-
-#~ msgid "Unconnceted coastline"
-#~ msgstr "Linea di costa non connessa"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr ""
-#~ "E' richiesto almeno un oggetto da eliminare, ottenuta una collezione vuota"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Valore non corretto per l''operatore tags: {0}. L''operatore tags "
-#~ "richiede il numero di etichette o un intervallo, per esempio tags:1 "
-#~ "oppure tags:2-5"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr ""
-#~ "Impossibile aggiungere la primitiva {0} all''insieme di dati perché è già "
-#~ "incluso"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr ""
-#~ "Errore: linea ''''{0}'''' non prevista nella lista dei segnalibri "
-#~ "proveniente dal server"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
-#~ "''''{1}'''' nella lista dei segnalibri proveniente dal server"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -48917,2678 +45060,153 @@
 #~ "probabilmente continuare a lavorare senza problemi."
 
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Livello di ingrandimento minimo: "
-
 #~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
+#~ msgstr ""
+#~ "Lista degli elementi uniti. Questi sostituiranno gli elementi personali "
+#~ "non appena saranno applicate le decisioni sull''unione."
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Aggiorna sempre senza chiedere"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
+#~ msgstr ""
+#~ "Attenzione: eccezione ignorata perché l''elaborazione è stata annullata. "
+#~ "L''eccezione è stata: {0}"
+
+#~ msgid ""
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
 #~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
 #~ msgstr[0] ""
-#~ "{0} conflitto è stato <strong>risolto automaticamente</strong> eliminando "
-#~ "{0} oggetto<br>dall''insieme di dati locale perché è stato eliminato dal "
-#~ "server."
+#~ "<html>Una operazione di caricamento e/o salvataggio di un livello "
+#~ "contenente modifiche<br>è stata annullata oppure è fallita.</html>"
 #~ msgstr[1] ""
-#~ "{0} conflitti sono stati <strong>risolti automaticamente</strong> "
-#~ "eliminando {0} oggetti<br> dall''insieme di dati locale perché sono stati "
-#~ "eliminati dal server."
+#~ "<html>Delle operazioni di caricamento e/o salvataggio di {0} livelli "
+#~ "contenenti modifiche<br>sono state annullate oppure sono fallite.</html>"
 
 #~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflitto in attesa di essere risolto.<br><br>Aprire la lista dei "
-#~ "conflitti e risolverlo manualmente."
-#~ msgstr[1] ""
-#~ "{0} conflitti in attesa di essere risolti.<br><br>Aprire la lista dei "
-#~ "conflitti e risolverli manualmente."
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
+#~ msgstr ""
+#~ "<html>In alternativa si può inserire un <strong>indirizzo</strong> per un "
+#~ "singolo tassello nel formato <i>zoomlevel/x/y</i>, es. <i>15/256/223</i>. "
+#~ "Sono anche validi gli indirizzi nel formato <i>zoom,x,y</i> oppure "
+#~ "<i>zoom;x;y</i>.</html>"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Apri un editor per il divieto di svolta selezionato"
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the target node or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the target node will "
-#~ "take the place of the original node in the membership.</html>"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "<html>I nodi uniti sono membri di una o più relazioni. Decidere se si "
-#~ "desidera <strong>mantenere</strong> queste appartenenze per il nodo di "
-#~ "destinazione oppure se si vuole <strong>rimuoverle</strong>.<br>Il "
-#~ "comportamento predefinito è di <strong>mantenerle</strong>: il nodo di "
-#~ "destinazione prenderà il posto del nodo originale nell'appartenenza.</"
-#~ "html>"
+#~ "L''estensione cadastre-fr usata tradizionalmente per gestire la "
+#~ "scorciatoia da tastiera F11\n"
+#~ "che è attualmente riservata per la modalità a tutto schermo\n"
+#~ "Si desidera ripristinare F11 per l''azione di trascinamento?"
+
+#~ msgid "Both"
+#~ msgstr "Entrambi"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Permette di escludere i tracciati GPS non necessari"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Correggi indirizzi"
 
 #~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the combined way or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
-#~ "take the place of the original way in the membership.</html>"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "<html>I percorsi uniti sono membri di una o più relazioni. Decidere se si "
-#~ "desidera <strong>mantenere</strong> queste appartenenze per il percorso "
-#~ "unito oppure se si vuole <strong>rimuoverle</strong>.<br>Il comportamento "
-#~ "predefinito è di <strong>mantenerle</strong>: il percorso unito prenderà "
-#~ "il posto del percorso originale nell'appartenenza.</html>"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Visualizza a schermo pieno"
+#~ "(imposta  \"{0}\"  a si/no/chiedi nelle preferenze\n"
+#~ "per controllare il caricamento automatico dei file di calibrazione)"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "E'' stato trovato un file di calibrazione associato all''immagine:"
 
 #~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "Trascina un segmento di percorso per creare un rettangolo. Tieni premuto "
-#~ "il tasto Ctrl per muovere un segmento lungo la sua perpendicolare."
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Chiudi la finestra, ma non creare un nuovo nodo"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Commuta la visualizzazione a schermo pieno"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}"
-
-#~ msgid "User with the same uid but different name found"
+#~ "Impostare  \"{0}\"  a si/no/chiedi nelle preferenze\n"
+#~ "per controllare il caricamento automatico dei file di calibrazione."
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
 #~ msgstr ""
-#~ "E' stato trovato un utente con lo stesso identificativo ma con nomi "
-#~ "differenti"
+#~ "Inoltre, d''ora in poi, i file di calibrazione saranno sempre caricati "
+#~ "automaticamente."
 
 #~ msgid ""
-#~ "Can''t merge because either of the participating primitives is new and "
-#~ "the other is not"
-#~ msgstr ""
-#~ "Impossibile unire perché una delle primitive è nuova e le altre invece no"
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "Impossibile unire le primitive con identificativi differenti. Questo id è "
-#~ "{0}, l''altro è {1}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
-
-#~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "Impossibile confrontare la primitiva con ID ''''{0}'''' alla primitiva "
-#~ "con ID ''''{1}''''."
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "Sistema geodetico settentrionale UTM20"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Francia)"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Impossibile aprire una cartella.<br>Selezionare un file!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Apertura di {0} file..."
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Parentesi chiusa mancante"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Imposta il contrassegno ''modificato'' per il percorso {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Imposta il contrassegno ''modificato'' per la relazione {0}"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Imposta il contrassegno ''modificato'' per il nodo {0}"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Chiuso"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Apri"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Scarica e visualizza lo storico delle primitive selezionate"
-
-#~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
-#~ msgstr ""
-#~ "Impossibile assegnare un identificativo del gruppo di modifiche  > 0 ad "
-#~ "una nuova primitiva. Il valore dell''identificativo del gruppo di "
-#~ "modifiche è {0}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valore non corretto dell''operatore della versione: {0}. Era atteso un "
-#~ "numero."
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valore non corretto dell''operatore del gruppo di modifiche: {0}. Era "
-#~ "atteso un numero."
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "Era atteso un valore intero > 0 per il parametro ''''{0}'''', ottenuto "
-#~ "''''{1}''''"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Inserire un identificativo per il gruppo di modifiche"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Apri una pagina di preferenze per le impostazioni globali."
-
-#~ msgid ""
-#~ "Can''t restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Impossibile limitare l''interrogazione sui gruppi di modifiche ad uno "
-#~ "specifico riquadro di selezione. L''inserimento non è valido."
-
-#~ msgid ""
-#~ "<html>The selected object isn''t available in the current<br>edit layer "
-#~ "''{0}''.</html>"
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer ''{0}''.</html>"
-#~ msgstr[0] ""
-#~ "<html>L''oggetto selezionato non è disponibile nel livello<br>delle "
-#~ "modifiche corrente ''{0}''.</html>"
-#~ msgstr[1] ""
-#~ "<html>Nessuno degli oggetti selezionati è disponibile nel "
-#~ "livello<br>delle modifiche corrente ''{0}''.</html>"
-
-#~ msgid "User name: "
-#~ msgstr "Nome utente: "
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Ingrandisci la visuale sulle primitive contenute in questo gruppo di "
-#~ "modifiche nel livello dei dati corrente"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr ""
-#~ "Ingrandisci la visuale sulle primitive corrispondenti nel livello dei "
-#~ "dati corrente"
-
-#~ msgid "zoom level"
-#~ msgstr "livello di ingrandimento"
-
-#~ msgid "autozoom"
-#~ msgstr "ingrandimento automatico"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Ingrandimento automatico: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Livello di ingrandimento massimo: "
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr ""
-#~ "Il valore corrente non è un ID del gruppo di modifiche valido. Si prega "
-#~ "di inserire un valore intero > 0"
-
-#~ msgid ""
-#~ "Can't build changeset query with time based restrictions. Input isn't "
-#~ "valid."
-#~ msgstr ""
-#~ "Impossibile costruire l'interrogazione sui gruppi di modifiche con le "
-#~ "restrizioni temporali. L'inserimento non è valido."
-
-#~ msgid "Current value ''{0}'' for user ID isn''t valid"
-#~ msgstr ""
-#~ "Il valore corrente ''''{0}'''' non è valido per l'identificativo utente"
-
-#~ msgid ""
-#~ "The current value isn't a valid user ID. Please enter an integer value > 0"
-#~ msgstr ""
-#~ "Il valore corrente non è un identificativo utente valido. Si prega di "
-#~ "inserire un valore intero > 0"
-
-#~ msgid ""
-#~ "<html>The  current value isn't a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr ""
-#~ "<html>Il valore corrente non è un nome utente valido.<br>Si prega di "
-#~ "inserire un nome utente non vuoto.</html>"
-
-#~ msgid "User ID: "
-#~ msgstr "ID utente; "
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>JOSM è in esecuzione con un utenza anonima. Non può scaricare<br>il "
-#~ "tuo changesets dal server OSM fino a che non viene immesso lo username "
-#~ "OSM<br> nelle preferenze di JOSM.</html>"
-
-#~ msgid "Can''t restrict the changeset query to the user name ''{0}''"
-#~ msgstr "Non è possibile restringere l'interrogazione all' utente ''{0}''"
-
-#~ msgid ""
-#~ "Can't restrict changeset query to the current user because the current "
-#~ "user is anonymous"
-#~ msgstr ""
-#~ "Non è possibile restringere l'interrogazione all'utente corrente perchè "
-#~ "l'attuale utente è anonimo"
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "Immettere la password per il tuo account OSM"
-
-#~ msgid ""
-#~ "<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-#~ "username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Autenticazione fallita nelle OSM API ''{0}'' . Immettere un nome "
-#~ "utente ed una password valida.</html>"
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: Scaricamento relazione ''''{2}''''..."
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Fallita l''autenticazione al server proxy HTTP ''''{0}'''' . Si "
-#~ "prega di inserire un nome utente ed una password validi.</html>"
-
-#~ msgid ""
-#~ "<html>Warning: depending on the authentication method the proxy server "
-#~ "uses the password may be transferred unencrypted.</html>"
-#~ msgstr ""
-#~ "<html>Attenzione: in base al metodo di autenticazione utilizzato dal "
-#~ "server proxy la password potrebbe essere trasferita in chiaro.</html>"
-
-#~ msgid ""
-#~ "Failed to update primitive with id {0} because current edit layer doesn't "
-#~ "include such a primitive"
-#~ msgstr ""
-#~ "Fallito l''aggiornamento della primitiva con identificativo {0} perché il "
-#~ "livello delle modifiche corrente non include una primitiva del genere"
-
-#~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
-#~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">configura gruppo di modifiche</"
-#~ "a>)"
-
-#~ msgid ""
-#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
-#~ "to map editing.<br>"
-#~ msgstr ""
-#~ "Cliccare ''<strong>{0}</strong>'' per continuare il caricamento su nuovi "
-#~ "gruppi di modifiche addizionali.<br>Cliccare ''<strong>{1}</strong>'' per "
-#~ "ritornare alla finestra di caricamento.<br>Cliccare ''<strong>{2}</"
-#~ "strong>'' per interrompere il caricamento e ritornare a modificare la "
-#~ "mappa.<br>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
-#~ "<br>Siccome i suoi punti non includono una marcatura temporale non è "
-#~ "possibile correlarli con le immagini.</html>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
-#~ "<br>Siccome i suoi punti non includono una marcatura temporale non è "
-#~ "possibile correlarli con la traccia audio.</html>"
-
-#~ msgid ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-#~ msgstr ""
-#~ "Il server ha segnalato che il gruppo di modifiche corrente è stato chiuso."
-#~ "<br>Questo perché probabilmente la dimensione del gruppo di modifiche "
-#~ "supera il limite massimo<br>di {0} oggetti sul server ''''{1}''''."
-
-#~ msgid ""
-#~ "<html>Can''t upload {0} objects in one request because the<br>max. "
-#~ "changeset size {1} on server ''{2}'' is exceeded.</html>"
-#~ msgstr ""
-#~ "<html>Impossibile caricare {0} oggetti mediante una singola richiesta "
-#~ "perché<br>è stata superata la dimensione massima {1} del gruppo di "
-#~ "modifiche sul server ''''{2}''''.</html>"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Visualizza le immagini georeferenziate come sfondo in JOSM (server WMS, "
-#~ "Yahoo, ...)."
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "Ricerca delle traduzioni disponibili..."
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
-#~ msgstr ""
-#~ "<html>Sono state correlate <b>{0}</b> foto su <b>{1}</b> al tracciato GPX."
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Attenzione: non è stata trovata alcuna preferenza ''''{0}''''."
-
-#~ msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-#~ msgstr "<html>Impossibile leggere i file.<br> L''errore è: <br>{0}</html>"
-
-#~ msgid "You've encountered a bug in JOSM"
-#~ msgstr "Ci si è imbattuti in un bug di JOSM"
-
-#~ msgid "Plugin {0} is no longer necessary and has been deactivated."
-#~ msgstr "L''estensione {0} non è più necessaria ed è stata disattivata."
-
-#~ msgid "Delete old plugin file {0}"
-#~ msgstr "Elimina il file della vecchia estensione {0}"
-
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Elimina la vecchia estensione {0}"
-
-#~ msgid ""
-#~ "Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
-#~ "capabilities. Got ''{2}"
-#~ msgstr ""
-#~ "Attenzione: valore non valido per l''attributo ''''{0}'''' dell''elemento "
-#~ "''''{1}'''' per le capacità del server. Ottenuto ''{2}"
-
-#~ msgid "({0}/{1}) Uploading {2} objects..."
-#~ msgstr "({0}/{1}) Caricamento di {2} oggetti..."
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
-
-#~ msgid "Checking translation for locale ''{0}''"
-#~ msgstr "Controllo della traduzione per la localizzazione ''''{0}''''"
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
-
-#~ msgid "Checking locales..."
-#~ msgstr "Controllo delle localizzazioni..."
-
-#~ msgid "Loading available locales..."
-#~ msgstr "Caricamento delle localizzazioni disponibili..."
-
-#~ msgid ""
-#~ "Can''t create a changeset query including both the query parameters "
-#~ "''uid'' and ''display_name''"
-#~ msgstr ""
-#~ "Impossibile creare una interrogazione sui gruppi di modifiche includendo "
-#~ "entrambi i parametri ''uid'' e ''display_name''"
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro "
-#~ "''''{0}'''', ottenuto {1}"
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr ""
-#~ "Era atteso un identificativo unico > 0 per la primitiva, ottenuto {0}"
-
-#~ msgid ""
-#~ "Warning: the JVM is not configured to lookup proxies from the system "
-#~ "settings. The property ''java.net.useSystemProxies'' was missing at "
-#~ "startup time. Won't use a proxy."
-#~ msgstr ""
-#~ "Attenzione: la JVM non è stata configurata per ottenere i proxy dalle "
-#~ "impostazioni di sistema. Manca il parametro di avvio ''java.net."
-#~ "useSystemProxies''. Non verrà utilizzato alcun proxy."
-
-#~ msgid ""
-#~ "<html><p>Alternatively if that doesn't work you can manually fill in the "
-#~ "information<br>below at this URL:</p></html>"
-#~ msgstr ""
-#~ "<html><p>In alternativa, se non dovesse funzionare, le informazioni "
-#~ "possono essere specificate manualmente<br>all'indirizzo URL seguente:</"
-#~ "p></html>"
-
-#~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
-#~ "and internal id {2}"
-#~ msgstr ""
-#~ "Attenzione: ignorato il gruppo di modifiche con id {0} per il nuovo "
-#~ "oggetto con id esterno {1} e con id interno {2}"
-
-#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Era atteso un valore di tipo intero > 0 per il parametro ''''{0}'''', "
-#~ "ottenuto {1}"
-
-#~ msgid ""
-#~ "<html><p>You've encountered an error in JOSM. Before you file a "
-#~ "bug<br>make sure you've updated to the latest version of JOSM here:</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Ci si è imbattuti in un errore di JOSM. Prima di prendere nota "
-#~ "del bug<br>assicurarsi di aver aggiornato JOSM all'ultima versione "
-#~ "consultando il seguente indirizzo:</p></html>"
-
-#~ msgid ""
-#~ "<html>You should also update your plugins. If neither of those help "
-#~ "please<br>file a bug in our bugtracker using this link:</p></html>"
-#~ msgstr ""
-#~ "<html>Si dovrebbero aggiornare anche le proprie estensioni. Se nessuna "
-#~ "delle azioni dovesse aiutare si prega<br>di prendere nota del bug nel "
-#~ "nostro bugtracker utilizzando questo link:</p></html>"
-
-#~ msgid ""
-#~ "<html><p>There the error information provided below should already "
-#~ "be<br>filled out for you. Please include information on how to "
-#~ "reproduce<br>the error and try to supply as much detail as possible.</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Le informazioni sull'errore sono state già inserite di seguito."
-#~ "<br>Si prega di descrivere il più dettagliatamente possibile i passaggi "
-#~ "per riprodurre l'errore.</p></html>"
-
-#~ msgid "Uploading {0} objects..."
-#~ msgstr "Caricamento di {0} oggetti..."
-
-#~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-#~ msgstr ""
-#~ "Attenzione: non è stato possibile ottenere le informazioni sull''utente "
-#~ "corrente di JOSM. L''eccezione è stata: {0}"
-
-#~ msgid "Run the automatic authorisation steps again"
-#~ msgstr "Esegui nuovamente i passaggi dell'autorizzazione automatica"
-
-#~ msgid "The user name can't be empty. Please enter your OSM user name"
-#~ msgstr ""
-#~ "Il nome utente non può essere vuoto. Si prega di inserire il proprio nome "
-#~ "utente OSM"
-
-#~ msgid "Authorise now"
-#~ msgstr "Autorizza adesso"
-
-#~ msgid "Click to redirect you to the authorisation form on the JOSM web site"
-#~ msgstr ""
-#~ "Cliccare per essere rediretti alla maschera di autorizzazione sul sito "
-#~ "web di JOSM"
-
-#~ msgid "Authorise JOSM to access the OSM API"
-#~ msgstr "Autorizza JOSM ad accedere alle API di OSM"
-
-#~ msgid "The password can't be empty. Please enter your OSM password"
-#~ msgstr ""
-#~ "La password non può essere vuota. Si prega di inserire la propria "
-#~ "password OSM"
-
-#~ msgid "Please select an authorisation procedure: "
-#~ msgstr "Si prega di selezionare una procedura di autorizzazione: "
-
-#~ msgid "Close the dialog and cancel authorisation"
-#~ msgstr "Chiudi la finestra ed annulla l'autorizzazione"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "I dati copiati contengono delle primitive incomplete.  Quando si incolla "
-#~ "le primitive incomplete sono rimosse.  Si desidera incollare i dati senza "
-#~ "le primitive incomplete?"
-
-#~ msgid ""
-#~ "Parameters --download, --downloadgps and --selection are processed in "
-#~ "this order."
-#~ msgstr ""
-#~ "I parametri --download, --downloadgps e --selection sono processati in "
-#~ "questo ordine."
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Attenzione: fallita l''analisi degli stili Mappaint da ''''{0}''''. "
-#~ "L''eccezione è stata: {1}"
-
-#~ msgid ""
-#~ "Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Attenzione: fallito il caricamento degli stili Mappaint da ''''{0}''''. "
-#~ "L''eccezione è stata: {1}"
-
-#~ msgid "Authorise URL:"
-#~ msgstr "Indirizzo URL di autorizzazione:"
-
-#~ msgid "OAuth authorisation failed"
-#~ msgstr "Autorizzazione OAuth fallita"
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Attenzione: manca il file di revisione '/REVISION'."
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Can''t deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "L''oggetto di destinazione con identificativo {0} e versione {1} è "
-#~ "visibile, mentre l''oggetto sorgente con versione minore {2} non è "
-#~ "visibile. Non è possibile gestire questa inconsistenza. Sarà mantenuto "
-#~ "l''oggetto di di destinazione. "
-
-#~ msgid ""
-#~ "Can't merge because either of the participating primitives is new and the "
-#~ "other is not"
-#~ msgstr ""
-#~ "Non è possibile fondere perché una delle primitive coinvolte è nuova e "
-#~ "l'altra invece no"
-
-#~ msgid ""
-#~ "Can't restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Non è possibile restringere l'interrogazione ad uno specifico riquadro di "
-#~ "selezione. L'inserimento non è valido."
-
-#~ msgid ""
-#~ "Can't create a changeset query including both the query parameters 'uid' "
-#~ "and 'display_name'"
-#~ msgstr ""
-#~ "Non è possibile creare una interrogazione includendo entrambi i parametri "
-#~ "'uid' e 'display_name'"
-
-#~ msgid ""
-#~ "<html>Could not retrieve the list of your open changesets because<br>JOSM "
-#~ "doesn't know your identity.<br>You've either chosen to work anonymously "
-#~ "or you are not entitled<br>to know the identity of the user on whose "
-#~ "behalf you are working.</html>"
-#~ msgstr ""
-#~ "<html>Impossibile ottenere la lista dei propri gruppi di modifiche aperti "
-#~ "perché<br>JOSM non conosce la tua identità.<br>Hai scelto di lavorare in "
-#~ "modalità anonima oppure non sei autorizzato<br>a conoscere l'identità "
-#~ "dell'utente per conto del quale lavori.</html>"
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-#~ msgstr ""
-#~ "<html>Sono state correlate al tracciato GPX <b>{0}</b> di <b>{1}</b> foto."
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>Run a fully automatic procedure to get an access token from the OSM "
-#~ "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-#~ "fully<br>automatically authorises the user and retrieves an Access Token."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Avvia una procedura completamente automatica per ottenere un token "
-#~ "di accesso dal sito web di OSM.<br>JOSM accede al sito web di OSM "
-#~ "impersonificando l'utente JOSM, lo autorizza automaticamente<br>ed "
-#~ "ottiene un token di accesso.</html>"
-
-#~ msgid ""
-#~ "<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>E'' stato ottenuto con successo un token di accesso OAuth dal sito "
-#~ "web di OSM. Cliccare su <strong>{0}</strong> per accettare il token. JOSM "
-#~ "lo utilizzerà nelle successive richieste per acquisire l''accesso alle "
-#~ "API di OSM.</html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed.<br><br>Please try again or choose another kind of "
-#~ "authorisation process,<br>i.e. semi-automatic or manual authorisation.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>E' fallito il processo automatico per l'ottenimento di un token di "
-#~ "accesso OAuth<br>dal server di OSM.<br><br>Si prega di riprovare o di "
-#~ "selezionare un altro tipo di processo di autorizzazione,<br>ad esempio la "
-#~ "semi-automatica o la manuale.</html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed because JOSM wasn't able to build<br>a valid login "
-#~ "URL from the OAuth Authorise Endpoint URL ''{0}''.<br><br>Please check "
-#~ "your advanced setting and try again.</html>"
-#~ msgstr ""
-#~ "<html>E'' fallito il processo automatico per l''ottenimento di un token "
-#~ "di accesso OAuth<br>dal server di OSM perché JOSM non è stato capace di "
-#~ "costruire<br>un indirizzo URL di accesso valido a partire dall''indirizzo "
-#~ "URL di autorizzazione OAuth ''''{0}''''.<br><br>Si prega di controllare "
-#~ "le proprie impostazioni avanzate e di riprovare.</html>"
-
-#~ msgid ""
-#~ "<html><body>Please enter an OAuth Access Token which is authorised to "
-#~ "access the OSM server ''{0}''.</body></html>"
-#~ msgstr ""
-#~ "<html><body>Si prega di inserire un token di accesso OAuth autorizzato ad "
-#~ "accedere al server OSM ''''{0}''''.</body></html>"
-
-#~ msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-#~ msgstr ""
-#~ "Il sito web OSM non ha risposto con un cookie di sessione in risposta a "
-#~ "''''{0}'''',"
-
-#~ msgid "Failed to authorise OAuth request  ''{0}''"
-#~ msgstr "Fallita l''autorizzazione della richiesta OAuth ''''{0}''''"
-
-#~ msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
-#~ msgstr ""
-#~ "Autorizzazione del token di richiesta OAuth ''''{0}'''' sul sito web di "
-#~ "OSM ..."
-
-#~ msgid "Authorising request token ''{0}''..."
-#~ msgstr "Autorizzazione del token di richiesta ''''{0}''''..."
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Fallita l''apertura della connessione al server "
-#~ "remoto<br>''''{0}''''.<br>Il nome dell''host ''''{1}'''' non può essere "
-#~ "risolto. <br>Controllare l''indirizzo URL delle API nelle preferenze "
-#~ "personali e la propria connessione ad internet.</html>"
-
-#~ msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
-#~ msgstr "<html>Passo 2/3: Autorizza ed ottieni un token di accesso</html>"
-
-#~ msgid ""
-#~ "<html><body>JOSM successfully retrieved a Request Token. JOSM is now "
-#~ "launching an authorisation page in an external browser. Please login with "
-#~ "your OSM username and password and follow the instructions to authorise "
-#~ "the Request Token. Then switch back to this dialog and click on <strong>"
-#~ "{0}</strong><br><br>If launching the external browser fails you can copy "
-#~ "the following authorise URL and paste it into the address field of your "
-#~ "browser."
-#~ msgstr ""
-#~ "<html><body>JOSM ha ottenuto con successo un token di richiesta. JOSM sta "
-#~ "per lanciare una pagina di autorizzazione in un browser esterno. Si prega "
-#~ "di accederci con il proprio nome utente e password OSM e di seguire le "
-#~ "istruzioni per autorizzare il token di richiesta. Quindi ritornare su "
-#~ "questa finestra e cliccare su <strong>{0}</strong><br><br>Se il browser "
-#~ "esterno non si apre si può copiare il seguente indirizzo URL di "
-#~ "autorizzazione ed incollarlo nella barra degli indirizzi del proprio "
-#~ "browser."
-
-#~ msgid ""
-#~ "<html>The AccessToken ''{1}'' is known to the OSM server ''{0}''.<br>The "
-#~ "test to retrieve the user details for this token failed, though."
-#~ "<br>Depending on what rights are granted to this token you may "
-#~ "nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-#~ "other protected resources.</html>"
-#~ msgstr ""
-#~ "<html>Il token di accesso ''''{1}'''' è conosciuto dal server OSM "
-#~ "''''{0}''''.<br>Nonostante questo è fallita la verifica di ottenimento "
-#~ "dei dettagli utente per questo token.<br>Si può tuttavia utilizzarlo in "
-#~ "base ai permessi che gli si sono concessi<br>(per il caricamento dati, "
-#~ "caricamento dei tracciati GPS, e/o accesso ad altre risorse protette).</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
-#~ "''{0}''.<br>The server rejected the Access Token as unauthorised. You "
-#~ "will not<br>be able to access any protected resource on this server using "
-#~ "this token.</html>"
-#~ msgstr ""
-#~ "<html>Fallito l''accesso al server OSM ''''{0}''''<br>con il token di "
-#~ "accesso ''''{0}''''.<br>Il server ha rifiutato il token di accesso perché "
-#~ "non autorizzato. Con questo token<br>non si sarà in grado di accedere ad "
-#~ "alcuna risorsa protetta su questo server.</html>"
-
-#~ msgid ""
-#~ "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM "
-#~ "server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' "
-#~ "with id ''{3}''.</html>"
-#~ msgstr ""
-#~ "<html>E'' stato utilizzato con successo il token di accesso ''''{0}'''' "
-#~ "per<br>accedere al server OSM all''indirizzo ''''{1}''''.<br>Si sta "
-#~ "accedendo al server OSM come utente ''''{2}'''' con identificativo "
-#~ "''''{3}''''.</html>"
-
-#~ msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
-#~ msgstr ""
-#~ "E'' stato proibito l''ottenimento dei dettagli utente con chiave del "
-#~ "token di accesso ''''{0}''''."
-
-#~ msgid ""
-#~ "<html><body>JOSM has successfully retrieved an Access Token. You can now "
-#~ "accept this token. JOSM will used it the future for authentication and "
-#~ "authorisation at the OSM server.<br><br>The access token is: "
-#~ msgstr ""
-#~ "<html><body>JOSM ha ottenuto con successo un token di accesso. Si può ora "
-#~ "accettare questo token. JOSM lo utilizzerà in futuro per autenticazione "
-#~ "ed autorizzazione al server OSM.<br><br>Il token di accesso è: "
-
-#~ msgid ""
-#~ "<html>Failed to retrieve information about the current userfrom the OSM "
-#~ "server ''{0}''.<br>This is probably not a problem caused by the tested "
-#~ "Access Token, but<br>rather a problem with the server configuration. "
-#~ "Carefully check the server<br>URL and your Internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Fallito l''ottenimento delle informazioni riguardanti l''utente "
-#~ "corrente dal server OSM ''''{0}''''.<br>Questo probabilmente non è un "
-#~ "problema causato dal token di accesso oggetto di verifica,<br>bensì un "
-#~ "problema con la configurazione del server. Controllare attentamente "
-#~ "l''indirizzo URL<br>del server e la propria connessione ad internet.</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>The test failed because the server responded with an internal error."
-#~ "<br>JOSM couldn''t decide whether the token is valid. Please try again "
-#~ "later.</html>"
-#~ msgstr ""
-#~ "<html>La verifica è fallita perché il server ha risposto con un errore "
-#~ "interno.<br>JOSM non può decidere se il token è valido. Si prega di "
-#~ "riprovare più tardi.</html>"
-
-#~ msgid ""
-#~ "<html>The OSM API server at ''{0}'' didn''t return a valid response."
-#~ "<br>It is likely that ''{0}'' isn''t an OSM API server.<br>Please check "
-#~ "the spelling of ''{0}'' and validate again.</html>"
-#~ msgstr ""
-#~ "<html>Il server delle API di OSM su ''''{0}'''' non ha restituito una "
-#~ "risposta valida.<br>''''{0}'''' non risulta essere un server delle API di "
-#~ "OSM.<br>Si prega di controllare l''ortografia di ''''{0}'''' e di "
-#~ "validare nuovamente.</html>"
-
-#~ msgid ""
-#~ "<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
-#~ "validate again.</html>"
-#~ msgstr ""
-#~ "<html>''''{0}'''' non è un indirizzo URL delle API di OSM valido.<br>Si "
-#~ "prega di controllare l''ortografia e di validare nuovamente.</html>"
-
-#~ msgid ""
-#~ "You don't have an Access Token yet to access the OSM server using OAuth. "
-#~ "Please authorise first."
-#~ msgstr ""
-#~ "Non si possiede ancora un token di accesso al server OSM mediante OAuth. "
-#~ "Si prega prima di autorizzare."
-
-#~ msgid ""
-#~ "Click to step through the OAuth authorisation process and generate a new "
-#~ "Access Token"
-#~ msgstr ""
-#~ "Cliccare per proseguire nel processo di autorizzazione OAuth e generare "
-#~ "un nuovo token di accesso"
-
-#~ msgid "Click to step through the OAuth authorisation process"
-#~ msgstr ""
-#~ "Cliccare per seguire i passaggi del processo di autorizzazione OAuth"
-
-#~ msgid "The current value isn't a valid URL"
-#~ msgstr "Il valore corrente non è un indirizzo URL valido"
-
-#~ msgid ""
-#~ "Warning: JOSM is configured to use proxies from the system setting, but "
-#~ "the JVM is not configured to retrieve them. Resetting preferences to 'No "
-#~ "proxy'"
-#~ msgstr ""
-#~ "Attenzione: JOSM è configurato per utilizzare i proxy ottenuti dalle "
-#~ "impostazioni di sistema, ma la JVM non è configurata per ottenerli. "
-#~ "Reimposto le preferenze su 'Nessun proxy'"
-
-#~ msgid ""
-#~ "Warning: the JVM is not configured to lookup proxies from the system "
-#~ "settings. The property 'java.net.useSystemProxies' was missing at startup "
-#~ "time. Won't use a proxy."
-#~ msgstr ""
-#~ "Attenzione: la JVM non è configurata per ottenere i proxy dalle "
-#~ "impostazioni di sistema. Inoltre manca il parametro di avvio 'java.net."
-#~ "useSystemProxies'. Non sarà utilizzato alcun proxy."
-
-#~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t "
-#~ "a valid URL. Skipping download."
-#~ msgstr ""
-#~ "Attenzione: Impossibile scaricare l''estensione ''''{0}''''. Il suo "
-#~ "collegamento ''''{1}'''' non è un indirizzo URL valido. Scaricamento "
-#~ "annullato."
-
-#~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-#~ msgstr ""
-#~ "Fallita l'aggiunta di una testata di autenticazione OAuth. Al momento non "
-#~ "è stato configurato alcun token di accesso OAuth."
-
-#~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link isn''t known. "
-#~ "Skipping download."
-#~ msgstr ""
-#~ "Attenzione: Impossibile scaricare l''estensione ''''{0}''''. Non si "
-#~ "conosce il suo collegamento. Scaricamento annullato."
-
-#~ msgid ""
-#~ "Illegal document structure. Found node, way, or relation outside of "
-#~ "'create', 'modify', or 'delete'."
-#~ msgstr ""
-#~ "Struttura del documento non valida. E' stato trovato un nodo, percorso o "
-#~ "relazione al di fuori di un 'create', 'modify' o 'delete'."
-
-#~ msgid ""
-#~ "<html>You updated your JOSM software.<br>To prevent problems the plugins "
-#~ "should be updated as well.<br><br>Update plugins now?</html>"
-#~ msgstr ""
-#~ "<html>E' stato aggiornato il proprio programma JOSM.<br>Per evitare "
-#~ "problemi dovrebbero essere aggiornate anche le estensioni."
-#~ "<br><br>Aggiornarle ora?</html>"
-
-#~ msgid ""
-#~ "A required plugin for plugin {0} was not found. The required plugin is:"
-#~ msgid_plural ""
-#~ "{1} required plugins for plugin {0} were not found. The required plugins "
-#~ "are:"
-#~ msgstr[0] ""
-#~ "Non è stata trovata una estensione richiesta dall''estensione {0}. "
-#~ "L''estensione richiesta è:"
-#~ msgstr[1] ""
-#~ "Non sono state trovate {1} estensioni richieste dall''estensione {0}. Le "
-#~ "estensioni richieste sono:"
-
-#~ msgid "loading plugin ''{0}''"
-#~ msgstr "caricamento estensione ''''{0}''''"
-
-#~ msgid "The plugin file ''{0}'' doesn't include a Manifest."
-#~ msgstr "Il file dell''estensione ''''{0}'''' non include un Manifest."
-
-#~ msgid ""
-#~ "Please open the Preference Dialog after JOSM has started and try to "
-#~ "update them manually."
-#~ msgstr ""
-#~ "Si prega di aprire la finestra delle preferenze dopo l'avvio di JOSM e di "
-#~ "provare ad aggiornarle manualmente."
-
-#~ msgid "Removing umaintained plugins..."
-#~ msgstr "Rimozione delle estensioni non più mantenute..."
-
-#~ msgid ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-#~ msgstr ""
-#~ "Attenzione: fallita l''installazione dell''estensione ''''{0}'''' già "
-#~ "scaricata. Installazione annullata. JOSM continuerà a caricare la vecchia "
-#~ "versione dell''estensione."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Il percorso interno del multi-poligono è esterno."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Non-percorso nel multi-poligono."
-
-#~ msgid ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-#~ msgstr ""
-#~ "Si dovrebbero aggiornare anche le proprie estensioni. Se nemmeno questo "
-#~ "risolve la situazione si prega di inserire una segnalazione del problema "
-#~ "nel nostro bugtracker utilizzando questo collegamento:"
-
-#~ msgid ""
-#~ "You have encountered an error in JOSM. Before you file a bug reportmake "
-#~ "sure you have updated to the latest version of JOSM here:"
-#~ msgstr ""
-#~ "Ci si è imbattuti in un errore di JOSM. Prima di segnalare questo "
-#~ "problema assicurarsi di aver aggiornato JOSM all'ultima versione da qui:"
-
-#~ msgid ""
-#~ "There the error information provided below should already befilled in for "
-#~ "you. Please include information on how to reproducethe error and try to "
-#~ "supply as much detail as possible."
-#~ msgstr ""
-#~ "Le informazioni sull'errore sono state di seguito già inserite. Si prega "
-#~ "di includere la procedura per riprodurlo e il maggior numero possibile di "
-#~ "dettagli in merito."
-
-#~ msgid ""
-#~ "Alternatively, if that doesn't work you can manually fill in the "
-#~ "informationbelow at this URL:"
-#~ msgstr ""
-#~ "Se non dovesse funzionare in alternativa si possono inserire manualmente "
-#~ "le informazioni sottostanti tramite questo indirizzo URL:"
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Carica automaticamente i tasselli "
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "ATTENZIONE: formato URL base dell''API inatteso. Il reindirizzamento alla "
-#~ "pagina di informazioni o dello storico delle primitive OSM probabilmente "
-#~ "fallirà. L''URL di base delle API è: \"{0}\""
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Valori negativi denotano l''emisfero Occidentale/Meridionale."
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr ""
-#~ "Per favore inserire un valore di latitudine valido nell''intervallo "
-#~ "-90..90"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr ""
-#~ "Per favore inserire un valore di latitudine nell''intervallo -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr ""
-#~ "Per favore inserire un valore di longitudine valido nell''intervallo "
-#~ "-180..180"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr ""
-#~ "Per favore inserire un valore di longitudine nell''intervallo -180..180"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" non è chiuso e quindi non può essere unito."
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "L''area auto-sovrapposta è stata unita"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Ci sono dei conflitti non risolti nel livello ''{0}''.<br>E'' "
-#~ "necessario risolvere prima questi.</html>"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Numero errato di parametri per l''operatore tags."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Valore non corretto per l''operatore sui nodi: {0}. L''operatore sui nodi "
-#~ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Valore non corretto per l''operatore id: {0}. E'' atteso un numero."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Il livello ''{0}'' possiede già un conflitto per la "
-#~ "primitiva<br>''{1}''.<br>Questo conflitto non può essere aggiunto.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Attenzione: Il livello ''{0}'' non esiste più. Non è possibile rimuovere "
-#~ "il conflitto per la primitiva ''{1}''."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "E'' stato trovato più di un percorso \"from\"."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "E'' stato trovato più di un percorso \"to\"."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "E'' stata trovata più di una \"via\"."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
-
-#~ msgid "No, cancel operation"
-#~ msgstr "No, annulla l''operazione"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Elimina fisicamente dall''insieme di dati locale"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Si, reimposta l''id"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Reimposta l''id a 0"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM dovrà eliminare la tua primitiva locale con identificativo {0}"
-#~ "<br>dall''insieme di dati.<br>Si è d''accordo?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Elimina dall''insieme di dati"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Selezionare per limitare l''interrogazione solamente sui propri "
-#~ "gruppi di modifiche.<br>Deselezionare per includere tutti i gruppi di "
-#~ "modifiche nell''interrogazione.</html>"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>La relazione figlia<br>{0}<br>risulta eliminata sul server. Non può "
-#~ "essere caricata"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Aggiungi tutte le primitive selezionate nell''insieme di dati corrente "
-#~ "prima del primo membro"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Aggiungi tutte le primitive selezionate nell''insieme di dati corrente "
-#~ "dopo l''ultimo membro"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Aggiungi tutte le primitive selezionate nell''insieme di dati corrente "
-#~ "prima del primo membro selezionato"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Aggiungi tutte le primitive selezionate nell''insieme di dati corrente "
-#~ "dopo l''ultimo membro selezionato"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr ""
-#~ "Cliccare per ritornare all''editor delle relazioni e per ripristinare la "
-#~ "modifica della relazione"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Colora i punti e i segmenti del tracciato in base alla diluizione della "
-#~ "precisione in orizzontale (HDOP). E'' necessario che il proprio "
-#~ "dispositivo di acquisizione registri queste informazioni."
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Abilita lo stile predefinito ''incorporato''"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Le scorciatoie da tastiera sono assegnate all''avvio di JOSM. Bisogna "
-#~ "<b>riavviare</b> JOSM per applicare le modifiche.</p>"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Inoltre le scorciatoie sono abilitate quando sono assegnate a una voce "
-#~ "di menu o un pulsante per la prima volta. Quindi alcune delle modifiche "
-#~ "fatte possono essere attive anche senza riavviare --- ma anche senza la "
-#~ "gestione delle collisioni. Questa è un''altra ragione per <b>riavviare</"
-#~ "b> JOSM dopo aver apportato delle modifiche in questa sezione.</p>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>L''ultima pagina elenca le chiavi dei modificatori che JOSM assegnerà "
-#~ "automaticamente ai collegamenti. Per ciascuno dei quattro tipi di "
-#~ "collegamenti ci sono tre alternative. Durante la gestione dei conflitti, "
-#~ "JOSM proverà queste alternative nell''ordine in cui sono elencate. Se "
-#~ "tutte le alternative producono collegamenti già assegnati, allora ne "
-#~ "verrà assegnato uno casuale.</p>"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Posizione dell''origine della griglia"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Indice di direzione ''{0}'' non trovato"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Preferenze per l''estensione di controllo remoto."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "L''estensione di controllo remoto si metterà sempre in ascolto sulla "
-#~ "porta 8111 sulla macchina locale. La porta non è variabile perché è usata "
-#~ "dalle applicazioni esterne che devono dialogare con l''estensione."
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Impostazioni per l''estensione SlippyMap"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Tasto di scelta rapida ''{0}'' duplicato - sarà ignorato!"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Stai per cancellare dei nodi fuori dall''area scaricata.<br>Questo "
-#~ "potrebbe causare dei problemi poiché i nodi potrebbero far parte di altri "
-#~ "oggetti (che non puoi vedere).<br>Vuoi veramente cancellarli?"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Questo controllo trova gli oggetti  in più lingue il cui attributo "
-#~ "''name'' non sia identico a qualche attributo ''name:*'' e non sia una "
-#~ "composizione di attributi ''name:*'', es., Italia - Italien - Italy."
-
-#~ msgid "Exception occurred"
-#~ msgstr "E'' stata generata una eccezione"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Non è possibile far corrispondere il collegamento inserito o "
-#~ "l''identificativo al servizio selezionato. Si prega di riprovare."
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Non c''è al momento alcun livello WMS da regolare."
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Preferenze dell''estensione WMS"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Modifica la lista dei server WMS mostrata nel menù dell''estensione WMS"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Un validatore di dati OSM. Controlla se sono presenti dei problemi "
-#~ "all''interno dei dati, è fornisce delle soluzioni per quelli più comuni. "
-#~ "Correttore ortografico integrato per i nomi delle etichette."
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>Impossibile aprire una cartella.<br>Si prega di selezionare un file!"
-#~ "</html>"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr "Sposta i nodi in modo che tutti gli angoli siano di 90 o 270 gradi"
-
-#~ msgid "GPS point"
-#~ msgstr "Punto GPS"
-
-#~ msgid "Download Object"
-#~ msgstr "Scarica Oggetto"
-
-#~ msgid "Download Object..."
-#~ msgstr "Scarica Oggetto..."
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "sentiero alpino impegnativo"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "sentiero alpino difficile"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "escursionismo alpino"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "escursionisti esperti"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "sentiero alpino"
-
-#~ msgid "nice Plugin"
-#~ msgstr "buona estensione"
-
-#~ msgid "Josminator - Just do it!"
-#~ msgstr "Josminator - Fallo e basta!"
-
-#~ msgid "Dsdfasdfsdfotos"
-#~ msgstr "Dsdfasdfsdfotos"
-
-#~ msgid "Do some stuff"
-#~ msgstr "Fa qualcosa"
-
-#~ msgid "Exec"
-#~ msgstr "Esegui"
-
-#~ msgid "Execute Script"
-#~ msgstr "Esegui script"
-
-#~ msgid ""
-#~ "Following primitives could not be added because they are deleted: {0}"
-#~ msgstr ""
-#~ "Le seguenti primitive non possono essere aggiunte perché sono state "
-#~ "eliminate: {0}"
-
-#~ msgid "Use all mine elements"
-#~ msgstr "Utilizza tutti gli elementi personali"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Si sta impostando un ruolo vuoto su {0} primitiva."
-#~ msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive."
-
-#~ msgid "Use all their elements"
-#~ msgstr "Utilizza tutti i loro elementi"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Questo equivale all''eliminazione dei ruoli di queste primitive."
-
-#~ msgid "range"
-#~ msgstr "intervallo"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Ripristina {0} primitiva"
-#~ msgstr[1] "Ripristina {0} primitive"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Le seguenti primitive non possono essere copiate verso la primitiva di "
-#~ "destinazione<br>perché sono state eliminate nell''insieme di dati di "
-#~ "destinazione:"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Fallita l''unione delle primitive eliminate"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "L''oggetto di destinazione con identificativo {0} e versione {1} è "
-#~ "visibile, mentre l''oggetto sorgente con versione precedente {2} non è "
-#~ "visibile. Non è possibile gestire questa inconsistenza. Verrà mantenuto "
-#~ "l''oggetto di destinazione. "
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "C'è {0} ulteriore primitiva a cui fa riferimento la relazione {1}<br>la "
-#~ "quale è stata eliminata sul server.<br><br>Si desidera ripristinare anche "
-#~ "questa primitiva?"
-#~ msgstr[1] ""
-#~ "Ci sono {0} ulteriori primitive a cui fa riferimento la relazione {1}"
-#~ "<br>le quali sono state eliminate sul server.<br><br>Si desidera "
-#~ "ripristinare anche queste primitive?"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "C'è {0} ulteriore nodo utilizzato dal percorso {1}<br>il quale è stato "
-#~ "eliminato sul server.<br><br>Si desidera ripristinare anche questo nodo?"
-#~ msgstr[1] ""
-#~ "Ci sono {0} ulteriori nodi utilizzati dal percorso {1}<br>i quali sono "
-#~ "stati eliminati sul server.<br><br>Si desidera ripristinare anche questi "
-#~ "nodi?"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Contenuto mancante per l''argomento di "
-#~ "aiuto</p><p class=\"warning-body\">Il contenuto per l''argomento di aiuto "
-#~ "<strong>{0}</strong> non è ancora disponibile. E'' assente sia nella "
-#~ "propria lingua ({1}) che in inglese.<br><br>Si invita ad apportare il "
-#~ "proprio contributo per migliorare il sistema di aiuto JOSM ed inserire le "
-#~ "informazioni mancanti. E'' possibile modificare l''argomento di aiuto <a "
-#~ "href=\"{2}\">nella propria lingua ({1})</a> oppure l''argomento <a href="
-#~ "\"{3}\">in inglese</a>.</p></html>"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Attenzione: fallita l''analisi degli stili Mappaint da ''{0}''. "
-#~ "L''eccezione è stata: {1}"
-
-#~ msgid "Image zoom interpolation:"
-#~ msgstr "Interpolazione ingrandimento immagine:"
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Seleziona automaticamente il primo livello WMS durante la cattura se "
-#~ "esistono livelli multipli."
-
-#~ msgid "<number>"
-#~ msgstr "<numero>"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Carica i dati di calibrazione su un file"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Immagine non creata correttamente."
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "loading plugin ''{0}'' ({1})"
-#~ msgstr "Caricamento plugin \"{0}\" ({1})"
-
-#~ msgid ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-#~ msgstr ""
-#~ "<html>Impossibile scaricare i dati. Formato non supportato, non conforme "
-#~ "e/o inconsistente.<br><br>Dettagli (non tradotti): {0}</html>"
-
-#~ msgid "Set width of building"
-#~ msgstr "Imposta la larghezza dell'edificio"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Punta su un'estremità opposta dell'edificio"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Punta su un angolo dell'edificio per iniziare a disegnare"
-
-#~ msgid "Indipend."
-#~ msgstr "Indipend."
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Etichettatura preimpostata errata \"{0}-{1}\" - il numero di elementi in "
-#~ "display_values deve essere lo stesso di values"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Impossibile caricare l''estensione {0} perché<br>la classe base "
-#~ "''{1}'' non è stata trovata.<br>Eliminare dalle preferenze?"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Si prega di inserire il proprio nome utente e password OSM. La password "
-#~ "<strong>non</strong> sarà salvata in chiaro nelle preferenze di JOSM e "
-#~ "sarà inviata al server OSM <strong>soltanto una volta</strong>. Le "
-#~ "successive richieste di caricamento dei dati non utilizzeranno più la "
-#~ "password."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Attenzione:</strong> La password è trasferita <strong>una volta</"
-#~ "strong> in chiaro al sito web di OSM. <strong>Non</strong> utilizzare una "
-#~ "password importante finché il server OSM non provvede all''instaurazione "
-#~ "di un canale di comunicazione cifrato (HTTPS)."
-
-#~ msgid ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-#~ msgstr ""
-#~ "Con OAuth concedi a JOSM il diritto di caricare i dati della mappa ed i "
-#~ "tracciati GPS a nome tuo (<a href=\"urn:josm-oauth-info\">maggiori "
-#~ "informazioni...</a>)."
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Questa funzionalità richiede (almeno) un livello speciale di catasto\n"
-#~ "fabbricati e un livello dati OSM."
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Estrai edificio al click (solamente immagini vettoriali)"
-
-#~ msgid "Edit turn restriction #{0} in layer ''{1}''"
-#~ msgstr "Modifica il divieto di svolta #{0} nel livello ''{1}''"
-
-#~ msgid "Edit new turn restriction in layer ''{0}''"
-#~ msgstr "Modifica un nuovo divieto di svolta nel livello ''{0}''"
-
-#~ msgid "Create new turn restriction in layer ''{0}''"
-#~ msgstr "Crea un nuovo divieto di svolta nel livello ''{0}''"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Inserisci gli oggetto ''via'' presenti negli appunti"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Attenzione: l''estensione per i divieti di svolta sostituisce "
-#~ "l''azione''{0}'' già esistente accessibile con la scorciatoia ''{1}'' con "
-#~ "l''azione ''{2}''"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Questo divieto di svolta utilizza il percorso OSM <span class=\"object-"
-#~ "name\">{0}</span> con ruolo <tt>from</tt> <strong>e</strong> con ruolo "
-#~ "<tt>to</tt>. In un divieto di svolta il percorso con ruolo <tt>from</tt> "
-#~ "dovrebbe essere differente dal percorso con ruolo <tt>to</tt>."
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "Il percorso <strong>from</strong> <span class=\"object-name\">{0}</span> "
-#~ "ed il percorso <strong>to</strong> <span class=\"object-name\">{1}</span> "
-#~ "si intersecano sul nodo <span class=\"object-name\">{2}</span> ma <span "
-#~ "class=\"object-name\">{2}</span> non è un oggetto <strong>via</strong>."
-#~ "<br> Si consiglia di impostare <span class=\"object-name\">{2}</span> "
-#~ "come un oggetto <strong>via</strong> unico."
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Aggiungi un percorso OSM con ruolo ''from''"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Aggiungi un percorso OSM con ruolo ''to''"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "In un divieto di svolta è richiesto un percorso OSM con ruolo <tt>to</tt>."
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "Vai all''editor di base e scegli manualmente un percorso OSM."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "In un divieto di svolta è richiesto un percorso OSM con ruolo <tt>from</"
-#~ "tt>."
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "Il percorso OSM <span class=\"object-name\">{0}</span> con ruolo <tt>{1}</"
-#~ "tt> dovrebbe essere diviso in corrispondenza del nodo <span class="
-#~ "\"object-name\">{2}</span> dove si connette con il percorso <span class="
-#~ "\"object-name\">{3}</span>."
-
-#~ msgid "Splits the way"
-#~ msgstr "Divide il percorso"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Questo divieto di svolta utilizza il nodo OSM <span class=\"object-name\">"
-#~ "{0}</span> come membro avente ruolo <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Questo divieto di svolta utilizza la relazione OSM <span class=\"object-"
-#~ "name\">{0}</span> come membro avente ruolo <tt>{1}</tt>."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Posizionati sull''editor di base e seleziona un percorso OSM"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Al suo posto è richiesto un percorso OSM"
-
-#~ msgid ""
-#~ "The turnrestrictions plugin allows to create and edit turn restrictions "
-#~ "in the OpenStreetMap database."
-#~ msgstr ""
-#~ "L''estensione turnrestrictions permette la creazione e la modifica dei "
-#~ "divieti di svolta nella base dati di OpenStreetMap."
-
-#~ msgid "tagged"
-#~ msgstr "etichettato"
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Filtro Nascosto: {0} Disabilitato: {0}"
-
-#~ msgid "Grab buildings"
-#~ msgstr "Trascina edifici"
-
-#~ msgid " Video"
-#~ msgstr " Video"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Per mantenere la propria versione locale, JOSM<br>deve ripristinare "
-#~ "l''id della primitiva {0} a 0.<br>Al prossimo caricamento il server gli "
-#~ "assegnerà <br>un nuovo id.<br>Sei d''accordo?</html>"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr ""
-#~ "E'' stato specificato un ID non valido. Impossibile scaricare l''oggetto."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Si è in procinto di eliminare gli oggetti incompleti.<br>Questo causerà "
-#~ "dei problemi perché non si vedrà l'oggetto reale.<br>Si desidera "
-#~ "veramente eliminare?"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "L''allineamento posizionerebbe i nodi al di fuori dei limiti "
-#~ "cartografici.\n"
-#~ "L''azione è stata annullata."
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "Non è possibile allineare dei segmenti connessi.\n"
-#~ "Si prega di selezionare due segmenti che non condividono alcun nodo."
-
-#~ msgid "farmland"
-#~ msgstr "area agricola"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Benvenuto nella</span><br>\n"
-#~ "estensione <span style=\"font-size: xx-large;\">AlignWay<span style="
-#~ "\"color: rgb(204, 85, 0);\">S</span><br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...da chiamare piuttosto <br>\n"
-#~ "estensione <span style=\"font-size: large;\">AlignWayS(egments)</span>..."
-#~ "</span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Allineare i segmenti.</b> Premere <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. In alternativa si può usare il comando "
-#~ "presente nel menu <b>Strumenti</b>\n"
-#~ " oppure si può aggiungere l''azione alla <b>barra degli strumenti</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid "Missing new dataset object for {0} with id {1}"
-#~ msgstr "Nuovo oggetto mancante per {0} con id {1}"
-
-#~ msgid "With kiosk"
-#~ msgstr "Con chiosco"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "La destinazione di tipo {0} con id {1} ha una versione non valida"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Trascina solamente il livello degli edifici"
-
-#~ msgid "{0} covers {1}% of GPS track"
-#~ msgstr "{0} copertura {1}% della traccia GPS"
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "Indicare un angolo dell'edificio per iniziare"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "Lo script figlio riporta dati non validi"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% della traccia GPS"
-
-#~ msgid "play/pause"
-#~ msgstr "play/pausa"
-
-#~ msgid "backward"
-#~ msgstr "Indietro"
-
-#~ msgid "forward"
-#~ msgstr "avanti"
-
-#~ msgid "faster"
-#~ msgstr "più veloce"
-
-#~ msgid "slower"
-#~ msgstr "più lento"
-
-#~ msgid "Building tag:"
-#~ msgstr "Tag edifici"
-
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Crea una relazione tra numero civico e nome della strada"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
-#~ msgstr ""
-#~ "Non utilizzare la relazione per gli indirizzi (bensì \"addr:street\" sui "
-#~ "nodi)."
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "Non utilizzare una relazione per gli indirizzi (utilizza invece "
-#~ "l''etichetta \"addr:street\" sugli elementi)."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr ""
-#~ "Solo per suggerimenti di direzione significativi (es. con etichetta di "
-#~ "senso unico)."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Permette all'utente di creare schemi cromatici differenti e di passare da "
-#~ "uno all'altro. E' sufficiente cambiare i colori e creare un nuovo schema. "
-#~ "E' usato per passare su uno sfondo bianco con colori abbinati in modo da "
-#~ "rendere la visualizzazione migliore sotto la luce del sole. Vedere la "
-#~ "schermata tra le preferenze di JOSM e le ''Impostazioni della "
-#~ "mappa'' (strano ma vero :-)"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Un'altra estensione per la correlazione delle immagini ai punti del "
-#~ "tracciato presenti in un file GPX. Una correlazione avviene quando "
-#~ "l'attributo ''name'', ''cmt'' oppure ''desc'' di una etichetta di un "
-#~ "punto del percorso corrisponde al nome del file di un'immagine."
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM ha trovato {0} livelli di dati OSM non salvati. Probabilmente JOSM è "
-#~ "stato chiuso inaspettatamente. Si desidera ripristinare i dati?"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "Impossibile leggere i dati OSM salvati in automatico ({0}) - {1}"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Nautica"
-
-#~ msgid "Desc"
-#~ msgstr "Descrizione"
-
-#~ msgid "read protocol version"
-#~ msgstr "leggi la versione del protocollo"
-
-#~ msgid "SeaMap Symbol Entry"
-#~ msgstr "Simbolo SeaMap"
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Editor delle caratteristiche nautiche"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Permette la modifica all''etichettatura dei punti del percorso."
-
-#~ msgid ""
-#~ "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to "
-#~ "grab."
-#~ msgstr ""
-#~ "Aggiungi \"Tableau(x) d'assemblage\" nella lista delle schede catastali "
-#~ "da trascinare."
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Conflitto nell''attributo ''visible'' per l''oggetto di tipo {0} con id "
-#~ "{1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "L''oggetto di tipo {0} con id {1} è stato marcato come da rimuovere, però "
-#~ "è assente dall''insieme di dati sorgente"
-
-#~ msgid "Edit OpenSeaMap"
-#~ msgstr "Modifica OpenSeaMap"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Abilita controllo remoto (richiede l''estensione remotecontrol)"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "si prega di inserire l''ora GPS"
-
-#~ msgid "jump"
-#~ msgstr "vai a"
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr ""
-#~ "Remote Control ha richiesto il caricamento di un livello WMS dal seguente "
-#~ "indirizzo URL:"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (mirror)"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Sembra che JOSM si sia chiuso inaspettatamente durante l''ultimo "
-#~ "utilizzo. Si desidera ripristinare i dati?"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr ""
-#~ "Sono selezionati {0} elementi. Si può però modificare solamente un "
-#~ "elemento!"
-
-#~ msgid "edit time-tag of selcted Element in a graphical interface"
-#~ msgstr ""
-#~ "Modifica l''etichetta dell''orario di un elemento selezionato in una "
-#~ "interfaccia grafica"
-
-#~ msgid "Internal style"
-#~ msgstr "Stile interno"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Modifica le proprietà di 1 oggetto"
-
-#~ msgid "edit opening_hours"
-#~ msgstr "Modifica orari di apertura"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Allinea i segmenti.</b> Premere <b><i><span style=\"color:green"
-#~ "\">"
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "L''estensione di controllo remoto non è compatibile con {0}."
-
-#~ msgid ""
-#~ "{0} will work but remote control is disabled.\n"
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "You should update the plugins. If this does not help report a bug for "
-#~ "\"{0}\"."
-#~ msgstr ""
-#~ "{0} funzionerà ma il controllo remoto è disabilitato.\n"
-#~ "La versione corrente di \"{1}\": {2}, versione interna {3}. Versione "
-#~ "richiesta {4}, versione interna {5}.\n"
-#~ "Si dovrebbero aggiornate le estensioni. Se questo non è risolutivo, "
-#~ "riportare l''errore per \"{0}\"."
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: Problema con il controllo remoto"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "Impossibile inizializzare il controllo remoto."
-
-#~ msgid "import data from URL"
-#~ msgstr "importa dati dall'indirizzo URL"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Livello WMS senza nome"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Il livello non supporta alcuna proiezione di JOSM,\n"
-#~ "e quindi non è possibile utilizzarlo. Questo messaggio non sarà più "
-#~ "visualizzato."
-
-#~ msgid "Add WMS URL"
-#~ msgstr "Aggiungi indirizzo URL WMS"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} funzionerà ma per questa estensione il controllo remoto è "
-#~ "disabilitato.\n"
-#~ "Si dovrebbero aggiornare le estensioni."
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "Versione corrente di \"{1}\": {2}, versione interna {3}. Versione "
-#~ "richiesta {4}, versione interna {5}.\n"
-#~ "Se l''aggiornamento delle estensioni non risolve il problema si prega di "
-#~ "segnalarlo per \"{0}\"."
-
-#~ msgid "Add relation"
-#~ msgstr "Aggiungi relazione"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr ""
-#~ "Apre il browser con la documentazione wiki riguardante l''oggetto "
-#~ "selezionato"
-
-#~ msgid "Get Capabilities"
-#~ msgstr "Recupera funzionalità"
-
-#~ msgid "Plugin for Seamap Editor"
-#~ msgstr "Estensione per la modifica di mappe nautiche"
-
-#~ msgid "Remote WMS"
-#~ msgstr "WMS remoto"
-
-#~ msgid "Seamap Editor"
-#~ msgstr "Editor Seamap"
-
-#~ msgid "Seanap Editor"
-#~ msgstr "Editor Seanap"
-
-#~ msgid "used"
-#~ msgstr "utilizzato"
-
-#~ msgid "Seamarks"
-#~ msgstr "Segnali nautici"
-
-#~ msgid "it works realy fine"
-#~ msgstr "funziona veramente bene"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "mappatura dei segnali nautuci"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Semplifica area (rimuovi {0} nodo)"
-#~ msgstr[1] "Semplifica area (rimuovi {0} nodi)"
-
-#~ msgid "Phone"
-#~ msgstr "Telefono"
-
-#~ msgid "Studio"
-#~ msgstr "Studio di registrazione"
-
-#~ msgid "Mineshaft Disused"
-#~ msgstr "Miniera in disuso"
-
-#~ msgid "Zugang"
-#~ msgstr "Accesso"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Profilo altimetrico per il tracciato '"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Si prega di posizionare manualmente il livello WMS utilizzando come "
-#~ "riferimento degli oggetti/tracciati/... conosciuti prima di iniziare a "
-#~ "mappare"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "La proiezione corrente è impostata su {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "imposta la proiezione da {0} a {1}"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "set {0}"
-#~ msgstr "imposta {0}"
-
-#~ msgid "Load file"
-#~ msgstr "Carica file"
-
-#~ msgid "Could not parse file. Not a PDF file?"
-#~ msgstr "Impossibile analizzare il file. Non è un PDF?"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Stili disponibili (da {0}):"
-
-#~ msgid "Apply all guesses"
-#~ msgstr "Applica tutte le possibilità"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "Post Code"
-#~ msgstr "Codice di avviamento postale"
-
-#~ msgid "Guess address data"
-#~ msgstr "Dati di indirizzo possibili"
-
-#~ msgid "Select in map"
-#~ msgstr "Seleziona nella mappa"
-
-#~ msgid "Guess street names"
-#~ msgstr "Nomi della strada possibili"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "Inserire le coordinate per il nuovo nodo.<br/>Si può separare la "
-#~ "longitudine e la latitudine con uno spazio, virgola o punto e virgola.<br/"
-#~ ">Utilizzare numeri positivi oppure i caratteri N ed E per indicare "
-#~ "rispettivamente le direzioni cardinali Nord o Est.<br/>Per le direzioni "
-#~ "cardinali Sud e Ovest si possono utilizzare sia i numeri negativi che i "
-#~ "caratteri S e W.<br/>Il valore della singola coordinata può assumere uno "
-#~ "dei seguenti tre formati:<ul><li><i>gradi</i><tt>&deg;</tt></"
-#~ "li><li><i>gradi</i><tt>&deg;</tt> <i>minuti</i><tt>&#39;</tt></"
-#~ "li><li><i>gradi</i><tt>&deg;</tt> <i>minuti</i><tt>&#39;</tt> <i>secondi</"
-#~ "i><tt>&quot</tt></li></ul>I simboli <tt>&deg;</tt>, <tt>&#39;</tt>, "
-#~ "<tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> sono opzionali.<br/"
-#~ "><br/>Alcuni esempi:<ul><li>49.29918&deg; 19.24788&deg;</li><li>N "
-#~ "49.29918 E 19.24788</li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</"
-#~ "li><li>N 49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 "
-#~ "N, 19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Cliccare per scaricare l''area attualmente selezionata"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "sostituita dall''estensione {0}"
-
-#~ msgid "OSM-Cert"
-#~ msgstr "OSM-Cert"
-
-#~ msgid "Key Signatures"
-#~ msgstr "Firme della chiave"
-
-#~ msgid "Key certified for OSM-Usage with comment:{0}"
-#~ msgstr "Chiave certificata per l''utilizzo OSM con commento:{0}"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "Comando GnuPG da eseguire:"
-
-#~ msgid "Privacy"
-#~ msgstr "Privacy"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "Non chiedere nuovamente la chiave"
-
-#~ msgid "Close bug"
-#~ msgstr "Chiudi bug"
-
-#~ msgid "Re-open bug"
-#~ msgstr "Ri-apri bug"
-
-#~ msgid "Experimental union of SlippyMap plugin and WMSPlugin"
-#~ msgstr "Fusione sperimentale delle estensioni SlippyMap e WMSPlugin"
-
-#~ msgid "Add comment"
-#~ msgstr "Aggiungi commento"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "Invalida bug"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr ""
-#~ "Il livello di zoom non era sufficiente per memorizzare uno scostamento "
-#~ "preciso"
-
-#~ msgid "Add offset bookmark"
-#~ msgstr "Aggiungi un segnalibro per lo scostamento"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Si prega di selezionare almeno due nodi da unire oppure un nodo in "
-#~ "prossimità di un altro nodo."
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Proiezione ''{0}'' non trovata"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Migrazione delle impostazioni WMSPlugin/SlippyMap"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Mantieni le impostazioni correnti"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Sovrascrivi con la lista WMSPlugin"
-
-#~ msgid "Keep current list"
-#~ msgstr "Mantieni la lista corrente"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "Ci sono {0} impostazioni sconosciute dell''estensione slippymap"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "Ci sono {0} impostazioni sconosciute di WMSPlugin"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Migrazione delle impostazioni delle immagini aeree: conflitto durante lo "
-#~ "spostamento della proprietà {0} -> {1}"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Sovrascrivi con le impostazioni WMSPlugin"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr ""
-#~ "Migrazione delle impostazioni delle immagini aeree: conflitto durante lo "
-#~ "spostamento della matrice {0} -> {1}"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Lista dei livelli WMS:"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Impostazioni WMSPlugin:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Impostazioni SlippyMap:"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Migrazione delle impostazioni delle immagini aeree"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Attenzione: conflitto delle impostazioni non previsto"
-
-#~ msgid "load imagery layers"
-#~ msgstr "carica livelli delle immagini aeree"
-
-#~ msgid "Settings for the Remote Control freature."
-#~ msgstr "Impostazioni per la funzionalità di controllo remoto."
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Sovrascrivi con le impostazioni SlippyMap"
-
-#~ msgid "(save current)"
-#~ msgstr "(salva corrente)"
-
-#~ msgid ""
-#~ "JOSM will always listen on port 8111 on localhost.The port is not "
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
 #~ "configurable because it is referenced by external applications talking to "
 #~ "JOSM."
 #~ msgstr ""
-#~ "JOSM resterà sempre in ascolto sulla porta 8111locale. La porta non è "
-#~ "configurabile perché è quella che utilizzano le applicazioni esterne per "
-#~ "dialogare con JOSM."
-
-#~ msgid "Violet"
-#~ msgstr "Viola"
-
-#~ msgid "Black"
-#~ msgstr "Nero"
-
-#~ msgid "Green"
-#~ msgstr "Verde"
-
-#~ msgid "Blue"
-#~ msgstr "Blu"
-
-#~ msgid "Amber"
-#~ msgstr "Ambra"
-
-#~ msgid "Yellow"
-#~ msgstr "Giallo"
-
-#~ msgid "Red"
-#~ msgstr "Rosso"
-
-#~ msgid "Orange"
-#~ msgstr "Arancione"
-
-#~ msgid "No colour"
-#~ msgstr "Nessun colore"
-
-#~ msgid "White"
-#~ msgstr "Bianco"
-
-#~ msgid "T3 - difficult"
-#~ msgstr "T3 - escursionisti esperti"
+#~ "JOSM si metterà sempre in ascolto sulla porta 8111 locale. Questa porta "
+#~ "non è configurabile perché è utilizzata dalle applicazioni esterne che "
+#~ "comunicano con JOSM."
+
+#~ msgid "Download referrers for the the chosen relation and its members"
+#~ msgstr ""
+#~ "Scarica gli oggetti collegati per la relazione scelta ed i suoi membri"
+
+#~ msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+#~ msgstr ""
+#~ "Saranno selezionati i percorsi adiacenti. I nodi saranno deselezionati."
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Sono stati trovati dei dati sospetti. Caricare ugualmente?"
+
+#~ msgid "unkown"
+#~ msgstr "sconosciuto"
 
 #~ msgid ""
-#~ "Bad implementation of '{0}' projection class: cannot set preferences to "
-#~ "match code ''{1}''"
+#~ "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
+#~ "tune simplification"
 #~ msgstr ""
-#~ "Implementazione della classe errata per la proiezione '{0}': impossibile "
-#~ "impostare le preferenze per concordare il codice ''{1}''"
-
-#~ msgid ""
-#~ "Projection code mismatch in '{0}': toCode() returns ''{1}'', expected "
-#~ "''{2}''"
-#~ msgstr ""
-#~ "Discordanza del codice della proiezione in '{0}': toCode() restituisce "
-#~ "''{1}'', atteso ''{2}''"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Ingrandimento migliore: {0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Scala dei pixel: {0}"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Mostra ingrandimento: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Ingrandimento corrente: {0}"
-
-#~ msgid "Contour Merge"
-#~ msgstr "Unione perimetri"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr ""
-#~ "Trascina/rilascia: trascina il segmento del percorso e rilascialo su un "
-#~ "segmento di destinazione"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr ""
-#~ "Unisci il perimetro che delimita di un''area con il perimetro di "
-#~ "un''altra area"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr ""
-#~ "Trascina il segmento del percorso e rilascialo su un segmento di "
-#~ "destinazione"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "Impossibile selezionare un nodo isolato"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Click-Sinistro: deseleziona nodo"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Unione dei perimetri"
-
-#~ msgid "Run..."
-#~ msgstr "Esegui..."
-
-#~ msgid "Run a script"
-#~ msgstr "Esegui uno script"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr "Seleziona un file script e clicca su <strong>Esegui</strong>."
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Click-Sinistro: seleziona nodo"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "Rilascia per allineare al segmento di destinazione"
-
-#~ msgid "Left-Click: on node to select/unselect; Drag: drag way slice"
-#~ msgstr ""
-#~ "Click-Sinistro: sul nodo per selezionare/deselezionare; Trascina: "
-#~ "trascina una parte del percorso"
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "Fallita la lettura dello script dal file ''{0}''."
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "Si prega di inserire prima un nome di file."
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "Il file script ''{0}'' non esiste."
-
-#~ msgid "Run the script"
-#~ msgstr "Esegui lo script"
-
-#~ msgid "Run"
-#~ msgstr "Esegui"
-
-#~ msgid "File not readable"
-#~ msgstr "File non leggibile"
-
-#~ msgid "The script file ''{0}'' isn't readable."
-#~ msgstr "Il file script ''{0}'' non è leggibile."
-
-#~ msgid "Empty file name"
-#~ msgstr "Nome di file vuoto"
-
-#~ msgid "File:"
-#~ msgstr "File:"
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "Inserisci il nome di un file script"
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "Fallita la lettura di una macro dal file ''{0}''."
-
-#~ msgid "IO error"
-#~ msgstr "Errore IO"
-
-#~ msgid "Launch file selection dialog"
-#~ msgstr "Visualizza la finestra di selezione file"
-
-#~ msgid "No scripting engine"
-#~ msgstr "Nessun motore di scripting"
-
-#~ msgid "Select a script"
-#~ msgstr "Seleziona uno script"
-
-#~ msgid "Script Error"
-#~ msgstr "Errore script"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "E'' fallita l''esecuzione dello script."
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, becasue there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>Lo script non può essere eseguito perché al momento non è stato "
-#~ "installato alcun motore di scripting.</p><p>Consultare il manuale in "
-#~ "linea per sapere come installare un motore di scripting con JOSM.</p>"
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "E'' fallita l''esecuzione della macro."
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Language version:"
-#~ msgstr "Versione del linguaggio:"
-
-#~ msgid "cancel"
-#~ msgstr "annulla"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "Accetta il motore di scripting selezionato"
-
-#~ msgid "Please select a scripting engine to execute the selected script."
-#~ msgstr ""
-#~ "Si prega di selezionare un motore di scripting per eseguire lo script "
-#~ "selezionato."
-
-#~ msgid "MIME-Types:"
-#~ msgstr "Tipi-MIME:"
-
-#~ msgid "Scripts"
-#~ msgstr "Script"
-
-#~ msgid "Language:"
-#~ msgstr "Linguaggio:"
-
-#~ msgid "{1} (with engine {0})"
-#~ msgstr "{1} (con il motore {0})"
-
-#~ msgid "Version:"
-#~ msgstr "Versione:"
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "Unisce i perimetri di due aree"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "Permette l''esecuzione degli script in JOSM."
-
-#~ msgid "remove entry"
-#~ msgstr "rimuovi voce"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "aggiungi una nuova voce wms/tms inserendo l''indirizzo url"
-
-#~ msgid "Internal Style"
-#~ msgstr "Stile interno"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "Il file script ''{0}'' non è leggibile."
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>Lo script non può essere eseguito perché non ci sono al momento dei "
-#~ "motori di script installati.</p><p>Consultare l''aiuto in linea per le "
-#~ "istruzioni su come installare un motore di script con JOSM.</p>"
-
-#~ msgid "No script engine"
-#~ msgstr "Nessun motore di script"
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr "Attenzione: fallito il caricamento dei tipi mime dal file ''0''."
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
-#~ msgstr ""
-#~ "Attenzione: fallito il caricamento dei tipi mime predefiniti dalla "
-#~ "risorsa ''0''."
-
-#~ msgid "Scripting"
-#~ msgstr "Script"
-
-#~ msgid "Configure..."
-#~ msgstr "Configura..."
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "Configura le preferenze per gli script"
-
-#~ msgid "Script engines"
-#~ msgstr "Motori di script"
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "Configura i motori di script e gli script"
-
-#~ msgid "JAR file"
-#~ msgstr "File JAR"
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM al momento supporta i seguenti motori di script:"
-
-#~ msgid "Available script engines"
-#~ msgstr "Motori di script disponibili"
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "''{0}'' non esiste."
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-#~ msgstr ""
-#~ "''{0}'' non è leggibile. Impossibile caricare un motore di script da "
-#~ "questo file."
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "''{0}'' è una cartella. Era atteso invece un file jar."
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr ""
-#~ "Il file jar ''{0}'' non fornisce un motore di script. Manca la voce "
-#~ "''{1}''."
-
-#~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
-#~ msgstr ""
-#~ "Fallita l''apertura del file ''{0}'' come un file jar. Impossibile "
-#~ "caricare un motore di script da questo file"
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr "Inserisci ulteriori file JAR che forniscono motori di script."
-
-#~ msgid "JAR files"
-#~ msgstr "File JAR"
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "Aggiungi un file jar che fornisce un motore di script"
-
-#~ msgid "Launch file chooser"
-#~ msgstr "Apri selezione file"
-
-#~ msgid "Remove the selected jar files"
-#~ msgstr "Rimuovi i file jar selezionati"
-
-#~ msgid "Select a jar file"
-#~ msgstr "Seleziona un file jar"
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "Built-in Style, internal path:</b>"
-
-#~ msgid "sidewalk"
-#~ msgstr "marciapiede"
-
-#~ msgid "parking_lot"
-#~ msgstr "parcheggio"
-
-#~ msgid "Number of {0]-ways junctions found: "
-#~ msgstr "Numero di collegamenti a {0]-vie trovati: "
-
-#~ msgid "Open Relation Editor"
-#~ msgstr "Apri l''editor delle relazioni"
-
-#~ msgid "Opens advanced relation/multipolygon editor panel"
-#~ msgstr "Apre un pannello per la modifica delle relazioni/multi-poligoni"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful( don't destray valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "I seguenti sono i risultati della validazione automatica. Tenta di "
-#~ "correggerli, ma sii prudente (non distruggere i dati validi). Se si è in "
-#~ "dubbio ignorarli.<br>Dopo aver chiuso questa finestra sarà possibile "
-#~ "consultare i risultati della validazione nel pannello accanto."
-
-#~ msgid "Some actions which you were never supposed to see."
-#~ msgstr "Alcune azioni che non hai mai pensato di vedere."
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Di seguito i risultati della validazione automatica. Prova a risolverli "
-#~ "con attenzione (non distruggere i dati validi). Se non sei sicuro "
-#~ "ignorali.<br>Dopo aver chiuso questo finestra è possibile consultare i "
-#~ "risultati nel pannello di validazione accanto."
-
-#~ msgid "Loading from Quick History Service"
-#~ msgstr "Caricamento dal servizio dello storico veloce in corso"
-
-#~ msgid "Analyzing"
-#~ msgstr "Analisi in corso"
-
-#~ msgid ""
-#~ "Can be useful when you are improving accuracy of existing ways. The idea "
-#~ "of the plugin is to substitute dragging and dropping nodes with clicking "
-#~ "to quicken the editing process."
-#~ msgstr ""
-#~ "Può essere utile quando si sta migliorando l''accuratezza dei percorsi "
-#~ "esistenti. L''idea di questa estensione è quella di sostituire il "
-#~ "trascinamento dei nodi con dei semplici click per velocizzare il processo "
-#~ "di modifica."
-
-#~ msgid "Makes a paralell copy of the selected way(s)"
-#~ msgstr "Crea una copia parallela del/i percorso/i selezionato/i"
-
-#~ msgid "Eps={0}"
-#~ msgstr "Eps={0}"
-
-#~ msgid " {0} members; "
-#~ msgstr " {0} membri; "
-
-#~ msgid " lat={0} lon={0} (projected: x={0}, y={0}); "
-#~ msgstr " lat={0} lon={0} (proiezione: x={0}, y={0}); "
-
-#~ msgid " {0} nodes; "
-#~ msgstr " {0} nodi; "
-
-#~ msgid ""
-#~ "Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}, Version: "
-#~ "{4}"
-#~ msgstr ""
-#~ "Insieme dei dati: {0}; Utente: [{1}]; ID dell''insieme di modifiche: {2}; "
-#~ "Data\\ora: {3}, Versione: {4}"
-
-#~ msgid " {0} names: {1}"
-#~ msgstr " {0} nomi: {1}"
-
-#~ msgid ""
-#~ "The GPX file doesn't contain valid trackpoints. Please use a GPX file "
-#~ "that has trackpoints."
-#~ msgstr ""
-#~ "Il file GPX non contiene alcun punto del tracciato valido. Utilizzare un "
-#~ "file GPX che contenga dei punti del tracciato."
-
-#~ msgid "Can't parse a time from this string."
-#~ msgstr "Impossibile interpretare un''ora da questa stringa"
-
-#~ msgid ""
-#~ "Surface values must not contain any of the following characters: ',' '{' "
-#~ "'}' '=' '|"
-#~ msgstr ""
-#~ "I valori di superficie non devono contenere alcuno dei seguenti "
-#~ "caratteri: ',' '{' '}' '=' '|"
-
-#~ msgid "Couldn't find built-in ruleset {0}"
-#~ msgstr "Impossibile trovare l''insieme di regole interno {0}"
-
-#~ msgid "Condition isn't finished at </condition> tag"
-#~ msgstr "La condizione non è finita con l''etichetta </condition>"
-
-#~ msgid "license validation error"
-#~ msgstr "errore nella validazione della licenza"
+#~ "Premere Invio per semplificare o salvare, Ctrl-Invio per salvare assieme "
+#~ "alle etichette, Su/Giù per regolare la semplificazione"
+
+#~ msgid "GraphView default node"
+#~ msgstr "Nodo predefinito di GraphView"
+
+#~ msgid "Graphview default segment"
+#~ msgstr "Segmento predefinito di Graphview"
+
+#~ msgid "Wxternal ruleset directory:"
+#~ msgstr "Cartella dell''insieme di regole Wxternal:"
 
 #~ msgid ""
 #~ "Surface values must not contain any of the following characters: '','', "
-#~ "''{'',  ''}'', ''='', ''|''"
+#~ "'''{''',  '''}''', ''='', ''|''"
 #~ msgstr ""
 #~ "I valori di superficie non devono contenere alcuno dei seguenti "
 #~ "caratteri: '','', ''{'',  ''}'', ''='', ''|''"
 
-#~ msgid "license validation other"
-#~ msgstr "altra segnalazione nella validazione della licenza"
-
-#~ msgid "license validation warning"
-#~ msgstr "avvertimento nella validazione della licenza"
-
-#~ msgid "lane"
-#~ msgstr "corsia"
-
-#~ msgid "Eps={0}, {1} points"
-#~ msgstr "Eps={0}, {1} punti"
-
 #~ msgid ""
-#~ "Lengths must be given as positive decimal numbers with unit \"m\", \"km"
-#~ "\", \"mi\" or without unit.\n"
-#~ "Alternatively, the format FEET' INCHES\" can be used."
+#~ "Depending on your Operating Stystem / Distribution, you may have to "
+#~ "create a default keyring / wallet first."
 #~ msgstr ""
-#~ "Le lunghezze devono essere espresse con numeri decimali positivi mediante "
-#~ "l’unità \"m\", \"km\", \"mi\" oppure senza unità.\n"
-#~ "In alternativa può essere utilizzato il formato FEET'' INCHES\"."
-
-#~ msgid "Erase and transfer to password manager"
-#~ msgstr "Cancella e trasferisci nel gestore delle password"
-
-#~ msgid ""
-#~ "Fatal: unexpected response from HTTP server. Got {0} response without "
-#~ "'Location' header. Can''t redirect. Aborting."
+#~ "A seconda del proprio sistema operativo / distribuzione, potrebbe essere "
+#~ "necessario creare prima un portachiavi predefinito."
+
+#~ msgid "Transfer to password manager and remove from prefence file"
 #~ msgstr ""
-#~ "Errore grave: risposta non prevista dal server HTTP. E'' stata ottenuta "
-#~ "la risposta {0} senza la testata ''Location''. Impossibile reindirizzare. "
-#~ "Esecuzione interrotta."
-
-#~ msgid "Fatal: too many redirects to the download URL detected. Aborting."
+#~ "Trasferisci al gestore delle password ed elimina dal file delle preferenze"
+
+#~ msgid "Global settings"
+#~ msgstr "Impostazioni generali"
+
+#~ msgid "JOSM's current projection"
+#~ msgstr "Proiezione corrente di JOSM"
+
+#~ msgid "Warning: ignoring exception because task is canceled. Exception: {0}"
 #~ msgstr ""
-#~ "Errore grave: sono stati rilevati troppi reindirizzamenti all''indirizzo "
-#~ "URL di scarico. Esecuzione interrotta."
-
-#~ msgid ""
-#~ "Error: failed to read from ''{0}''. Server responded with status code {1}."
-#~ msgstr ""
-#~ "Errore: fallita la lettura da ''{0}''. Il server ha risposto con il "
-#~ "codice {1}."
+#~ "Attenzione: ignoro l''errore perché il processo è stato annullato. "
+#~ "Eccezione: {0}"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 26529)
+++ applications/editors/josm/i18n/po/ja.po	(revision 26530)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-24 21:33+0000\n"
-"Last-Translator: ribbon <Unknown>\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-10 01:04+0000\n"
+"Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
 "Language: ja\n"
@@ -17,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:49+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:40+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-Language: Japanese\n"
@@ -25,5 +25,5 @@
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -38,12 +38,12 @@
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -98,6 +98,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -121,15 +122,15 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの \"{0}\" を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -142,13 +143,13 @@
 "バージョンのJOSMを使う事が出来ます。</li></ul>より詳細:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "JOSMを終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+msgstr "無視して続行"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -168,7 +169,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -178,6 +179,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -208,5 +209,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -392,6 +393,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -418,5 +419,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -424,7 +425,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -432,5 +434,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -643,5 +645,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -890,5 +892,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -897,5 +899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -972,5 +974,5 @@
 msgctxt "osm object types"
 msgid "mixed"
-msgstr ""
+msgstr "ミックス"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:70
@@ -1013,4 +1015,7 @@
 "<b>w123, n110, w12, r15</b><br/>"
 msgstr ""
+"オブジェクトIDはカンマまたはスペースで区切ることができます。<br/> 例: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> ミックスモード時は次のよう"
+"にオブジェクトを指定します: <b>w123, n110, w12, r15</b><br/>"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
@@ -1058,5 +1063,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:178
 msgid "missing objects:"
-msgstr ""
+msgstr "不明なオブジェクト:"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:203
@@ -1076,6 +1081,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1148,13 +1153,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:36
 msgid "Follow line"
-msgstr ""
+msgstr "ラインをフォロー"
 
 #: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:38
 msgid "Continues drawing a line that shares nodes with another line."
-msgstr ""
+msgstr "別のラインとノードを共有しているラインの描画を継続"
 
 #: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:40
 msgid "Follow"
-msgstr ""
+msgstr "フォロー"
 
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:35
@@ -1228,5 +1233,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1456,6 +1461,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -1522,4 +1527,6 @@
 "again."
 msgstr ""
+"入力されたリンクまたはIDは選択されたサービスと一致しません。再入力してくださ"
+"い。"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
@@ -1937,4 +1944,5 @@
 "selected objects:"
 msgstr ""
+"従属する以下のオブジェクトが削除されます。<br>選択されたオブジェクトに加えて:"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:260
@@ -2119,5 +2127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2428,7 +2436,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "データのダウンロード"
@@ -2682,6 +2690,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2808,10 +2816,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2927,9 +2935,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:129
 msgid "Parallel"
-msgstr ""
+msgstr "平行線"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:128
 msgid "Make parallel copies of ways"
-msgstr ""
+msgstr "並行するウェイのコピーを作成"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:187
@@ -2951,5 +2959,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:544
 msgid "Make parallel way error"
-msgstr ""
+msgstr "平行線作成エラー"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
@@ -2973,5 +2981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3538,4 +3546,8 @@
 "inspect them."
 msgstr ""
+"以下は自動的な妥当性検証の結果です。注意して（正しいデータを壊さないように）"
+"これらを修正してください。よく分からないときは無視してください。<br>このダイ"
+"アログをキャンセルすると、バリデータのサイドパネルで内容を確認するためのエン"
+"トリーを見つけることができます。"
 
 #. * Error messages
@@ -3576,6 +3588,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "疑わしいデータが見つかりましたがアップロードしますか？"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3624,40 +3636,40 @@
 msgstr "{0} の変更済みノード"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "ノード \"{1}\" の \"{0}\" を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "ウェイ \"{1}\" の \"{0}\" を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "リレーション \"{1}\" の \"{0}\" を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "ノード ''{2}''に {0}={1} を設定"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "ウェイ ''{2}''に {0}={1} を設定"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "リレーション ''{2}''に {0}={1} を設定"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "{1}オブジェクトの \"{0}\"を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3675,4 +3687,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
+"<html>レイヤー ''{0}'' には既に次のオブジェクトに対する競合が存在しています"
+"<br>''{1}''。<br>この競合は追加できません。</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3687,4 +3701,6 @@
 "object ''{1}''."
 msgstr ""
+"警告: レイヤー ''{0}'' は既に存在していません。オブジェクト ''{1}''に対する競"
+"合は取り除くことができません。"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67
@@ -3779,4 +3795,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "削除確認"
@@ -3864,6 +3881,5 @@
 msgid "Transform {0} node"
 msgid_plural "Transform {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 件のノードを変換"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:63
@@ -4086,9 +4102,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
-"に失敗"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4124,6 +4138,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr "警告: リビジョンファイルに予期せぬJOSMバージョン番号、値は ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4192,4 +4206,5 @@
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
 msgstr ""
+"投影法 ''{0}'' が見つかりません。ブックマーク ''{1}'' は利用できません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:186
@@ -4228,10 +4243,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSMはデータセット中にプリミティブ [{0} {1}] があることを期待していますが、見"
-"つかりませんでした。このことを http://josm.openstreetmap.de に報告してくださ"
-"い。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4250,4 +4262,6 @@
 "in the source dataset"
 msgstr ""
+"ID {1}のオブジェクトタイプ {0} は削除マークが付けられましたが、元のデータセッ"
+"トにありません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247
@@ -4332,5 +4346,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4348,8 +4362,8 @@
 msgstr "マルチポリゴン"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4380,4 +4394,6 @@
 "Error: failed to load map renderer class ''{0}''. The class wasn''t found."
 msgstr ""
+"エラー: マップレンダラークラス ''{0}''のロードに失敗。クラスが見つかりませ"
+"ん。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:143
@@ -4385,5 +4401,5 @@
 msgid ""
 "Can''t activate map renderer class ''{0}'', because the class wasn''t found."
-msgstr ""
+msgstr "レンダラークラス ''{0}''を有効化できません、クラスが見つかりません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:144
@@ -4391,5 +4407,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:154
 msgid "Activating the standard map renderer instead."
-msgstr ""
+msgstr "代わりに標準マップレンダラーを有効化しています。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:147
@@ -4399,4 +4415,6 @@
 "''{1}''."
 msgstr ""
+"マップレンダラークラス ''{0}''を有効化できません、 ''{1}''のサブクラスではあ"
+"りません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:153
@@ -4406,20 +4424,24 @@
 "map renderer."
 msgstr ""
+"マップレンダラークラス ''{0}''を有効化できません、マップレンダラーとして登録"
+"されていません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:165
 msgid "Wireframe Map Renderer"
-msgstr ""
+msgstr "ワイヤーフレームマップレンダラー"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:166
 msgid "Renders the map as simple wire frame."
-msgstr ""
+msgstr "マップをシンプルなワイヤーフレームとしてレンダリングします。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:170
 msgid "Styled Map Renderer"
-msgstr ""
+msgstr "スタイル付きマップレンダラー"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:171
 msgid "Renders the map using style rules in a set of style sheets."
 msgstr ""
+"スタイルシートのセット内のスタイルルールを使用してマップをレンダリングしま"
+"す。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -4491,52 +4513,64 @@
 msgstr "WGS84測地系 緯度経度座標"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。"
-"NTF<->RGF93 グリッドを読み込めません。"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "ランベルト 4 ゾーン（フランス）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} から {2} 度)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (コルシカ)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "ランベルトCCゾーン"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "ランベルトCC9ゾーン（フランス）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "ランベルトゾーン（エストニア）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "メルカトル"
@@ -4561,80 +4595,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG（ポーランド）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG ゾーン"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (ポーランド)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 ゾーン {0} (ポーランド)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "スイスグリッド (スイス)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Latvia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTMゾーン"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "北緯"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "半球"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "グアドループ・サンタンヌ 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "マルティニーク フォート・ドゼー 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM France (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4855,45 +4909,45 @@
 msgstr "このテストはマルチポリゴンが適切かどうかチェックします"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "エリアスタイルウェイが閉じられていません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "マルチポリゴンに外側のウェイがありません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "マルチポリゴンにスタイルがありません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "マルチポリゴンのリレーションにスタイルがありません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "マルチポリゴンが閉じられていません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "マルチポリゴンウェイ間の交差"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5164,5 +5218,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5187,5 +5241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5196,5 +5250,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5485,9 +5539,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:110
 msgid "Way end node near other highway"
-msgstr "ウェイは他の高速道路の近くでノードで終わっています。"
+msgstr "ウェイの終端ノードが他の道路の近くにあります。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:128
 msgid "Way end node near other way"
-msgstr "ウェイは他のウェイの近くでノードで終わっています。"
+msgstr "ウェイの終端ノードが他のウェイの近くにあります"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:149
@@ -5606,5 +5660,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5672,5 +5726,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "道路"
@@ -5678,5 +5732,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5684,10 +5738,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "水路"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "土地利用"
@@ -5697,5 +5751,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5708,5 +5762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5718,5 +5772,5 @@
 msgstr "公共輸送機関"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6078,5 +6132,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6187,4 +6241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6288,5 +6343,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6331,10 +6386,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>一つのタイルを指定する場合は、<strong>タイルのアドレス</strong> での指"
-"定も可能です。 <i>ズームレベル/x/y</i>で指定してください。例)<i>15/256/223</"
-"i>。<i>zoom,x,y</i> or <i>zoom;x;y</i>での指定も可能です。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6622,9 +6674,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられ"
-"るでしょう。"
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6859,10 +6909,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "自分の座標を残す"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "相手の座標を残す"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6918,6 +6968,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6939,6 +6989,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7334,5 +7384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7570,5 +7620,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7782,7 +7832,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "不明な"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8046,5 +8126,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8064,5 +8144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8079,5 +8159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "選択されたリレーションの不完全なメンバーをダウンロード"
@@ -8085,5 +8165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "不完全なメンバーをダウンロード"
@@ -8126,5 +8206,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8132,5 +8212,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8328,5 +8408,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8428,5 +8508,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "ユーザ"
@@ -9421,5 +9500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9601,5 +9680,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9744,4 +9823,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "自分が所有する変更セットのみ"
@@ -9754,4 +9834,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "次のユーザ名のユーザが所有する変更セットのみ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10039,9 +10125,9 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10049,13 +10135,13 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "空の値でタグを削除します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10068,18 +10154,19 @@
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "値を変更しますか?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "置換"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10088,5 +10175,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10095,5 +10182,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10101,27 +10188,31 @@
 msgstr[0] "これにより、{0} 個のオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "選択したオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10130,62 +10221,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "タグのヘルプについて、OSM wiki を表示します(F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "選択されたオブジェクトのためのwikiヘルプのためにブラウザを起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10248,9 +10339,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10272,6 +10365,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "{1} 件の親リレーションの {0} 件の不完全な子をダウンロード中"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10612,9 +10706,4 @@
 msgstr "インポートした内容には {0} の競合があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10655,10 +10744,4 @@
 msgid "Load relation"
 msgstr "リレーションをロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "警告: タスクがキャンセルされたので例外を無視します。例外コード: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10939,37 +11022,4 @@
 msgstr "タイプ"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "不明な"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11094,20 +11144,20 @@
 msgstr "座標"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "ノード {0} の履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "ウェイ {0} の履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "リレーション {0} の履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "履歴をサーバからリロード"
@@ -11202,6 +11252,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "変更セット"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11781,8 +11831,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12214,4 +12264,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12244,13 +12295,4 @@
 "<html> {0} 個のオブジェクトが1つの要求でアップロードできません。<br> これは、"
 "サーバ \"{2}\" の最大変更セットサイズである {1} を超えているためです。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html> {0}このオブジェクトをアップロードするには、<strong>複数の変更セット</"
-"strong>が必要です。どんな方法をとりますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12323,38 +12365,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "配色のカスタマイズ"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "既定"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12364,9 +12406,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12374,26 +12416,26 @@
 msgstr "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "時間間隔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "長さ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12401,8 +12443,8 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12410,12 +12452,12 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12423,10 +12465,10 @@
 msgstr[0] "{0} トラック "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12437,78 +12479,78 @@
 "よ :</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "近隣をダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "トラックのみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "ウェイポイントのみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "トラックおよびウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12519,11 +12561,11 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12533,6 +12575,6 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12542,27 +12584,27 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12574,29 +12616,29 @@
 "タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "インポートできません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12700,5 +12742,5 @@
 msgstr "次の問題が見つかりました:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12708,57 +12750,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "自動ズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "タイルの自動読み込み"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "タイルの読み込み"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "タイル情報を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "全てのタイルをロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "ズームアップ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "ズームダウン"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "タイルサイズに合わせる"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "タイルのキャッシュをフラッシュ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13300,15 +13350,15 @@
 msgstr "JPEGイメージ(*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "GPSマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13316,21 +13366,21 @@
 msgstr[0] "{0}は、{1}マーカーからなる"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "テキスト/アイコンを表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "マーカーテキストとアイコンの表示状態を切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "音声の同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13339,5 +13389,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13345,14 +13395,14 @@
 msgstr "地点 {0}で音声同期をとります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "再生されているレイヤーと同期させることができません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "再生の最初に音声マーカーを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13380,13 +13430,13 @@
 msgstr "新しいオーディオマーカーを生成できません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "このマーカーのURLを表示するときにエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URLは： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "URL を表示する際にエラー"
@@ -14392,82 +14442,82 @@
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "ウェイの向きを矢印で表示"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "一方通行の向きを矢印で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "アクティブなレイヤー以外は別の色で表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチエイリアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "エリアのアウトラインだけを描く"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14475,15 +14525,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "自動"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "名前"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "説明"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "なし"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14494,47 +14580,39 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "なし"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "HDOP（垂直精度劣化度）の値の円を描いてください"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率（赤=高い、緑=低い、可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -14542,5 +14620,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14564,5 +14642,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14605,5 +14683,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14617,38 +14695,18 @@
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "GPX読み込み時にマーカーを作成。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "自動"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "名前"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "説明"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "両方"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14659,10 +14717,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "GPSトラックのポイント間の線"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14670,35 +14728,35 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14706,14 +14764,14 @@
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14723,13 +14781,13 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14737,27 +14795,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "ウェイポイントラベル付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15423,10 +15499,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSMは常にlocalhostの8111番ポートをlistenします。 このポート番号は、外部アプ"
-"リケーションがJOSMと連携するために使うので変更できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15515,5 +15589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "リセット"
@@ -15806,6 +15880,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "常に問合せなしで更新する"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16212,5 +16286,5 @@
 msgstr "新しいリレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16239,9 +16313,9 @@
 msgstr "プリセットを検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "タグ内検索"
@@ -16536,9 +16610,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"GPXファイル ''{0}'' のパース中にエラー発生。ファイルの一部だけが利用可能と思"
-"われます"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16867,6 +16939,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr "OsmChangeのプロローグがまだ書かれていません。最初に書いてください。"
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17087,9 +17159,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"要素 ''bounds'' に必要な属性がありません。入力値: minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17487,4 +17557,9 @@
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18371,4 +18446,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18504,4 +18581,18 @@
 msgstr "XMLスキーマのロードに失敗。"
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19082,5 +19173,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35409,4 +35500,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35423,6 +35515,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35441,15 +35533,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "簡略化されたストリート名"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "単一ノードに一方通行のタグ"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "単一ノードに橋梁のタグ"
@@ -35460,12 +35552,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
-msgstr "ノード上の誤った高速道路タグ"
+msgstr "ノード上の誤った道路タグ"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "名前のない一般道(2車線未満)"
@@ -35474,16 +35566,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "参照のない道路"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "一時的な道路タイプ"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "スペルの間違ったキー名"
@@ -35493,10 +35585,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "bicycleタグつきの自転車道"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "footタグつきの遊歩道"
@@ -35505,10 +35597,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "自転車道のレーンとしてウェイを分離する"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "路上のバリア"
@@ -35517,35 +35609,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "遊歩道に最大速度が指定"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "+ sign付きのlayerタグ"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "ストリート名は ss を含んでいます。"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "typeのないリレーション"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "名前のないレストラン"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "通常無いタグの組み合わせ"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35650,117 +35751,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "チェコ CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "チェコ UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPEマップ"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPEマップ(Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7番目のシリーズ (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "国土交通省 (オルソ)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "国土交通省 (オルソ01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "国土交通省 (オルソ02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "国土交通省 (オルソ03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - イタリア"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36007,6 +36118,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "アップロードを中止"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36108,9 +36219,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36128,23 +36239,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36152,26 +36293,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "プラグイン情報"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36179,5 +36348,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36288,9 +36457,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36389,17 +36558,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "レイヤーのプロパティ"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "イメージレイヤを作成中にエラー: "
@@ -37038,31 +37224,35 @@
 msgstr "コミューンの選択"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "自動ソーシング"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"プラグイン cadastre-fr は取得キーのショートカット F11をこれまで使用しており\n"
-"これは現在デフォルトでフルスクリーンスイッチに割り当てられています。\n"
-"F11 を取得アクションに戻しますか？"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "F11 を取得ショートカットに戻す"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "変更が実施されるようにJOSM を停止しました"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37189,7 +37379,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え"
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38105,5 +38295,5 @@
 msgstr "EGPXレイヤを追加"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38114,17 +38304,17 @@
 "てください："
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
@@ -38276,5 +38466,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38282,10 +38472,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38294,5 +38484,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38301,6 +38491,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38309,9 +38499,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38470,71 +38660,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38542,32 +38740,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38602,6 +38794,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38732,30 +38924,43 @@
 msgstr "インポート中..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39447,5 +39652,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39462,5 +39667,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40202,17 +40407,17 @@
 msgstr "クリップボードからの新しい画像"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "サポートする画像ファイル"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "ファイルからの新しい画像..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "マップオブジェクトが見つかりません。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayerは画像のロードまたはインポートに失敗しました。"
@@ -40226,36 +40431,32 @@
 msgstr "クリップボードのデータは画像ではありません"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "これを適用しますか？"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "自動的に適用されます。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40877,5 +41078,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41845,4 +42046,21 @@
 msgstr "新しい署名キーを選択"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42068,6 +42286,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42318,6 +42536,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "選択中の転回制限用にエディタを開く"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -42892,5 +43110,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43286,4401 +43504,83 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "移動"
-
-#~ msgid "File could not be found."
-#~ msgstr "ファイルは存在しませんでした。"
-
-#~ msgid "Previous Marker"
-#~ msgstr "前のマーカー"
-
-#~ msgid "Next Marker"
-#~ msgstr "次のマーカー"
-
-#~ msgid "No data imported."
-#~ msgstr "データーはインポートされませんでした。"
-
-#~ msgid "Data Layer"
-#~ msgstr "データレイヤー"
-
-#~ msgid "Do not show again"
-#~ msgstr "今後は表示しない"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "必ず次の情報を含めること:"
-
-#~ msgid "Preparing data..."
-#~ msgstr "データを準備中..."
-
-#~ msgid "Uploading..."
-#~ msgstr "アップロード中..."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "最初にブックマークを選択してください、"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "場所の名称を入力してください。"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "最初に目的の座標を入力してください。"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "データソースと型"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。"
-
-#~ msgid "Download Area"
-#~ msgstr "エリアをダウンロードする"
-
-#~ msgid "Edit Properties"
-#~ msgstr "プロパティの編集"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "サーバに接続できません。"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "リストを更新するために再読込のクリック"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "本当にすべてのレイヤーを削除してよろしいですか?"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "選択したレイヤーの削除"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "テキスト/アイコンの表示/非表示"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "選択したリストを更新する。"
-
-#~ msgid "Update Plugins"
-#~ msgstr "プラグインのアップデート"
-
-#~ msgid "Commit comment"
-#~ msgstr "コメントを反映します"
-
-#~ msgid "Preparing..."
-#~ msgstr "準備中..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "サーバは変更した設定をサポートしていません"
-
-#~ msgid "Error during parse."
-#~ msgstr "パース中にエラーが発生しています"
-
-#~ msgid "Aborting..."
-#~ msgstr "中止します..."
-
-#~ msgid "Enter Password"
-#~ msgstr "パスワードを入力して下さい"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "保存されていない変更"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "変更を適用しません"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "円形内にそのノードはありません。"
-
-#~ msgid "Create a new map."
-#~ msgstr "新しい地図を作成します。"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "この変更をアップロードしますか?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "OSMサーバにすべての変更をアップロードします。"
-
-#~ msgid "Uploading data"
-#~ msgstr "アップロードするデータ"
-
-#~ msgid "Could not back up file."
-#~ msgstr "ファイルをバックアップできませんでした。"
-
-#~ msgid "Open in Browser"
-#~ msgstr "ブラウザで開く"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSMオンラインヘルプ"
+#~ msgid "Change values?"
+#~ msgstr "値を変更しますか?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "通常無いタグの組み合わせ"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "アップロードを中止"
 
 #~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
+#~ msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え"
+
+#~ msgid ""
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
+#~ msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "相手の座標を残す"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "自分の座標を残す"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
+
+#~ msgid ""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "次のプラグインに問題があります:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。"
+#~ "警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセッ"
+#~ "トに失敗"
 
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
+
+#~ msgid ""
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "{1}からプラグイン: {0}をダウンロードできません"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "正しくないパスワードかユーザ名です。"
+#~ "結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えら"
+#~ "れるでしょう。"
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "警告 - {0}プラグインのロードを要求されています。このプラグインはもう必須で"
-#~ "はありません。"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "プラグインが見つかりません： {0}"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "バグの報告前にJOSMの最新バージョンとすべてのプラグインのアップデートをして"
-#~ "ください。"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "（できる限り詳細に）エラーが発生するまでの手順を含めてください！"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "ウエイ以外で<nd>要素が見つかりました"
-
-#~ msgid "Unknown version"
-#~ msgstr "バージョン番号は不明です"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "osmサーバに接続できません。インターネット接続 をチェックしてください。"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し"
-#~ "て試してください。"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>要素がリレーション以外に見つかりました"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "id=0の禁じられたオブジェクトです"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "必要な属性\"{0}\"がありません"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "III-形式のノードID"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "変更セットを開いています…"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "エラーのため転送が中断しました（５秒待ちます）："
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "投影法が設定から読み取れませんでした。EPSG:4326を使用します。"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま"
-#~ "す。"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "保存されていない変更があります。変更分を破棄して継続しますか？"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "検索文字列を入力してください"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "地名検索結果をサーバから読み取ることができませんでした"
-
-#~ msgid "name"
-#~ msgstr "名前"
-
-#~ msgid "near"
-#~ msgstr "近く"
-
-#~ msgid "zoom"
-#~ msgstr "ズーム"
-
-#~ msgid "zoom level"
-#~ msgstr "ズームレベル"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "保存していない変更があります。それでもレイヤーを削除しますか？"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "直下のレイヤーを選択したレイヤーに結合します"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "レイヤー：{0}"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "予想外の例外が発生しました。\n"
-#~ "\n"
-#~ "これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合"
-#~ "には、\n"
-#~ "大目にみて、ぜひバグレポートをぜひお願いします。"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> はゼロ参照です。"
-
-#~ msgid "x from"
-#~ msgstr "X軸"
-
-#~ msgid "to"
-#~ msgstr "から"
-
-#~ msgid "y from"
-#~ msgstr "Y軸"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "OSMサーバに接続…"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "作者: {0}"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{1}トラックを含む {0}"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} ポイント"
-
-#~ msgid "Length: "
-#~ msgstr "長さ: "
-
-#~ msgid "Images for {0}"
-#~ msgstr "{0} のイメージ"
-
-#~ msgid "Read GPX..."
-#~ msgstr "GPXの読み込み…"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "地点 {0} x {1}に時刻がありません"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS開始: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS終了: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "現在の差分: {0} 秒"
-
-#~ msgid "timezone difference: "
-#~ msgstr "タイムゾーンの違い: "
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "画像"
-
-#~ msgid "{0} within the track."
-#~ msgstr "トラック内に {0}"
-
-#~ msgid "Sync clock"
-#~ msgstr "時計の同期"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "時刻をGPSユニットと同期する"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0}は削除されました)"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "ブックマークを読み込めません。"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "ブックマークを書き込みできません。"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSMアカウントのログイン名（email)"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
-
-#~ msgid "Base Server URL"
-#~ msgstr "サーバのベースURL"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSMユーザ名（email）"
-
-#~ msgid "OSM password"
-#~ msgstr "OSMパスワード"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "ビルトインのデフォルトを有効"
-
-#~ msgid "Keep backup files"
-#~ msgstr "バックアップファイルの保存"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "サイトの設定..."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "プロキシーサーバを有効"
-
-#~ msgid "Anonymous"
-#~ msgstr "匿名"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "プロキシー設定"
-
-#~ msgid "Proxy server host"
-#~ msgstr "プロキシーサーバのホスト名"
-
-#~ msgid "Proxy server port"
-#~ msgstr "プロキシーサーバのポート"
-
-#~ msgid "Proxy server username"
-#~ msgstr "プロキシーのユーザ名"
-
-#~ msgid "Proxy server password"
-#~ msgstr "プロキシーのパスワード"
-
-#~ msgid "Set the language."
-#~ msgstr "言語の変更"
-
-#~ msgid "Error while parsing"
-#~ msgstr "解析中にエラー"
-
-#~ msgid "File not found"
-#~ msgstr "ファイルが見つかりません"
-
-#~ msgid "No plugin information found."
-#~ msgstr "プラグイン情報が見つかりません。"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "次のプラグインを更新:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "プラグインをダウンロードしますか？\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "不足するプラグインをダウンロードします。"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Version {1}{2}"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ"
-#~ "ウンロードしますか？\n"
-#~ "{0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "プラグインはすでに存在しています"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Error deleting plugin file: {0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Error reading plugin information file: {0}"
-
-#~ msgid "Rotate"
-#~ msgstr "回転"
-
-#~ msgid "Change"
-#~ msgstr "更新"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Remove \"{0}\" for {1} ''{2}''"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Set {0}={1} for {2} ''{3}''"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Remove \"{0}\" for {1} {2}"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Set {0}={1} for {2} {3}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "削除 {1} {0}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "削除 {0} {1}"
-
-#~ msgid "true"
-#~ msgstr "真"
-
-#~ msgid "false"
-#~ msgstr "偽"
-
-#~ msgid "position"
-#~ msgstr "位置"
-
-#~ msgid "different"
-#~ msgstr "差異"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "情報ディレクトリを読み取れません: {0}"
-
-#~ msgid "S"
-#~ msgstr "南"
-
-#~ msgid "N"
-#~ msgstr "北"
-
-#~ msgid "W"
-#~ msgstr "西"
-
-#~ msgid "E"
-#~ msgstr "東"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "ランベルトゾーン（フランス）"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "リレーションに登録すべきものがありません。"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "メンバー \"{0}\"を関連から削除"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "不明なロール\"{0}\"です。"
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "\"from\"ウェイが見つかりません"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "\"to\"ウェイが見つかりません"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Error: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warning: {0}"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "ファイル\"{0}\"の名前を変更できませんでした。"
-
-#~ msgid "gps track description"
-#~ msgstr "gpsトラックの記述"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "チェックサムエラー "
-
-#~ msgid "Load Selection"
-#~ msgstr "セレクションのロード"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "連絡先 {0} ..."
-
-#~ msgid "Downloading..."
-#~ msgstr "ダウンロード…"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "検索文字列を入力してください"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "二つだけのノード選択が許されています"
-
-#~ msgid "Only one node selected"
-#~ msgstr "ただ一つだけのノードが選択されています。"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "新しいノードの座標を入力してください"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "{0}ノードを{1}ノードと見なす"
-
-#~ msgid "Slower Forward"
-#~ msgstr "ゆっくり再生"
-
-#~ msgid "Faster Forward"
-#~ msgstr "早回し"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "選択したウェイを複製"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "複製したウェイの作成"
-
-#~ msgid "load data from API"
-#~ msgstr "APIからデータ読み込み"
-
-#~ msgid "change the selection"
-#~ msgstr "選択の変更"
-
-#~ msgid "change the viewport"
-#~ msgstr "表示領域を変更"
-
-#~ msgid "Permitted actions"
-#~ msgstr "許可されたアクション"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "TCXファイルをインポート"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "方向インデックス'{0}'がありません"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "選択したエラーを修正"
-
-#~ msgid "Grid"
-#~ msgstr "グリッド"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "不正なタグ/値の組み合わせです"
-
-#~ msgid "Painting problem"
-#~ msgstr "色つけに問題発生"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Check for paint notes."
-
-#~ msgid "start"
-#~ msgstr "開始"
-
-#~ msgid "end"
-#~ msgstr "終了"
-
-#~ msgid "Slippy Map"
-#~ msgstr "スリッピーマップ"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "タイルの状態を表示"
-
-#~ msgid "Request Update"
-#~ msgstr "要求の更新"
-
-#~ msgid "image not loaded"
-#~ msgstr "画像が読み込まれていません。"
-
-#~ msgid "error loading metadata"
-#~ msgstr "メタデータの読み込みエラー"
-
-#~ msgid "requested: {0}"
-#~ msgstr "要求: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "アップデート要求時にエラー"
-
-#~ msgid "Tile Sources"
-#~ msgstr "タイルソース"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert Zone 1 cache file (.1)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert Zone 2 cache file (.2)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert Zone 3 cache file (.3)"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert Zone 4 cache file (.4)"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Tableau d'Assemblageを選択"
-
-#~ msgid "Zone"
-#~ msgstr "Zone"
-
-#~ msgid "Lambert zone"
-#~ msgstr "ランベルトゾーン"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "{0}からWMSタイルのダウンロード"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "AgPifoJで画像を開く..."
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "ジオタグされた写真の表示"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "タイムゾーンの選択: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "他の写真を開く"
-
-#~ msgid "All images"
-#~ msgstr "すべての画像"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "exif位置のついていない画像"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "まだタグ付けされていない画像"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPXトラックが読み込まれました"
-
-#~ msgid "Public"
-#~ msgstr "公開"
-
-#~ msgid "No username provided."
-#~ msgstr "ユーザ名が与えられていません。"
-
-#~ msgid "No password provided."
-#~ msgstr "パスワードが与えられていません。"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "作者パネルを表示"
-
-#~ msgid "Open User Page"
-#~ msgstr "ユーザページを開く"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "ブラウザでユーザページを開く"
-
-#~ msgid "Select User's Data"
-#~ msgstr "ユーザのデータを選択"
-
-#~ msgid "Please select some data"
-#~ msgstr "データを選択してください"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarenderオプション"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMSプラグイン設定"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (既定)"
-
-#~ msgid "help"
-#~ msgstr "ヘルプ"
-
-#~ msgid "Help / About"
-#~ msgstr "ヘルプ/情報"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "WMSプラグイン　ヘルプ"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Gridの起点位置"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Gridの回転"
-
-#~ msgid "Grid layout"
-#~ msgstr "グリッドのレイアウト"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Gridレイヤー："
-
-#~ msgid "Navigation"
-#~ msgstr "ナビゲーション"
-
-#~ msgid "standard"
-#~ msgstr "標準"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Motorboat"
-#~ msgstr "モーターボート"
-
-#~ msgid "Boat"
-#~ msgstr "ボート"
-
-# http://en.wikipedia.org/wiki/Draw_bridge
-#~ msgid "Drawbridge"
-#~ msgstr "跳ね橋"
-
-# http://en.wikipedia.org/wiki/Portcullis
-#~ msgid "Portcullis"
-#~ msgstr "城の格子戸"
-
-#~ msgid "Station"
-#~ msgstr "駅"
-
-#~ msgid "park_and_ride"
-#~ msgstr "パーク＆ライド"
-
-#~ msgid "Shop"
-#~ msgstr "自動車パーツショップ"
-
-#~ msgid "Edit Station"
-#~ msgstr "駅の編集"
-
-#~ msgid "Accomodation"
-#~ msgstr "宿泊施設"
-
-#~ msgid "map"
-#~ msgstr "マップ"
-
-#~ msgid "citymap"
-#~ msgstr "街路地図"
-
-#~ msgid "hikingmap"
-#~ msgstr "ハイキングマップ"
-
-#~ msgid "bicyclemap"
-#~ msgstr "自転車マップ"
-
-#~ msgid "football"
-#~ msgstr "フットボール"
-
-#~ msgid "rugby"
-#~ msgstr "ラグビー"
-
-#~ msgid "Motor Sports"
-#~ msgstr "モータースポーツ"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "モータースポーツの編集"
-
-#~ msgid "intermedia"
-#~ msgstr "中級"
-
-#~ msgid "advance"
-#~ msgstr "上級"
-
-#~ msgid "Football"
-#~ msgstr "フットボール"
-
-#~ msgid "Edit Football"
-#~ msgstr "フットボール場の編集"
-
-#~ msgid "Rugby"
-#~ msgstr "ラグビー"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "ラグビー場の編集"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "飲料店の編集"
-
-#~ msgid "sports"
-#~ msgstr "スポーツ店"
-
-#~ msgid "optician"
-#~ msgstr "眼鏡屋"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "空の値でキーを削除。"
-
-#~ msgid "Create new relation"
-#~ msgstr "新規関連作成"
-
-#~ msgid "Edit new relation"
-#~ msgstr "新規関連編集"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "関連 #{0}の編集"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "タグ（空の値でタグ自身を削除）"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "この関連から現在の行のメンバーを削除"
-
-#~ msgid "Members: {0}"
-#~ msgstr "メンバー: {0}"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "サーバからの応答内容が不正です。"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン"
-#~ "へと戻します。"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "指示の集積: {0}"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "ポイント"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "{0}ポイントをもつトラック"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "ファイル \"{0}\"中の日付が取得できません。"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "入力した時刻は、解釈できません"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "事前に設定した情報源をタグ付け"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "事前設定の情報源をタグ付け"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>ご理解ありがとうございます</p>"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "アップデートしたプラグインの活性化"
-
-#~ msgid "my version:"
-#~ msgstr "私のバージョン:"
-
-#~ msgid "their version:"
-#~ msgstr "相手のバージョン:"
-
-#~ msgid "resolved version:"
-#~ msgstr "解決したバージョン:"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "URL: \"{0}\"から読み込むことができません"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "URL: \"{0}\"の走査エラー"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "ファイルの拡張子が不明です"
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "保存中にエラー発生"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "JOSMをほかのアプリーケーションから制御できるようにするプラグインです。"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "リモート制御プラグインの設定。"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "TCXファイルをTCXファイルとしてインポート"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "現在の選択か、全てのデータ一式の検証"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)"
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "イメージ取得倍率:"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "WMSレイヤーの位置を調整"
-
-#~ msgid "Copy Default"
-#~ msgstr "既定のコピー"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "コピーする列を選択してください。"
-
-#~ msgid "Exception occurred"
-#~ msgstr "例外が発生しました"
-
-#~ msgid "Bridleway"
-#~ msgstr "馬道"
-
-#~ msgid "Cycleway"
-#~ msgstr "自転車道"
-
-#~ msgid "Waterway Point"
-#~ msgstr "水路ポイント"
-
-#~ msgid "board"
-#~ msgstr "board"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "ワイヤー量"
-
-#~ msgid "Add Selected"
-#~ msgstr "選択したものを追加"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "まだ実装されていません。"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
-
-#~ msgid "Save and Exit"
-#~ msgstr "保存して終了"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "{0}でトラブルチケットを報告してください。"
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "内部のウェイ ''{0}''が外側にあります。"
-
-#~ msgid "History of Element"
-#~ msgstr "要素の履歴"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "プリセットグループ \"{0}\""
-
-#~ msgid "Remove Selected"
-#~ msgstr "選択の削除"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "現在選択されている全てのオブジェクトを関連から削除"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "修正子 ID={0}"
-
-#~ msgid "Update position for: "
-#~ msgstr "次の場所を更新： "
-
-#~ msgid "Add a new layer"
-#~ msgstr "新規レイヤーを追加"
-
-#~ msgid "World"
-#~ msgstr "世界地図"
-
-#~ msgid "unitarianist"
-#~ msgstr "ユニテリアン"
-
-#~ msgid "Amenities"
-#~ msgstr "各種設備"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "十進経緯度を使う。"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "度分秒"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでし"
-#~ "た。"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})"
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "{0}のメンバーのタイプが不明"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "重要：データは、現在のランベルト図法のゾーン制限\n"
-#~ "の外にあります。\n"
-#~ "このメッセージ以降、データのアップロードを中止します。\n"
-#~ "最後に行った操作を取り消して、作業内容を保存し、\n"
-#~ "新しいレイヤーを新しいゾーンで開始してください。"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "選択 \"{0}\" は、関連 \"{1}\" において、ロール {2}として使われています。\n"
-#~ "関連から削除しますか？"
-
-#~ msgid "Split way segment"
-#~ msgstr "ウェイのセグメントを分割"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "ダウンロードしたエリア外のノードを削除しようとしています。<br>（あなたが見"
-#~ "ていない）ほかのオブジェクトが使っているかもしれないので、この操作は問題を"
-#~ "引き起こします。<br>本当に削除しますか？"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "ウェイが全て空です。"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "３つだけノードを選択するか、３つだけのノードを持つ１つのウェイを選択してく"
-#~ "ださい。"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "全体の設定のページを開きます。"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "ウェイだけを選択してください。"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>EPSG:4326投影法を使用しています。この投影法では、<br>長方形の配置を"
-#~ "行った場合に、意図しない結果になるおそれがあります。<br>対応するには、投影"
-#~ "法を変更してください。<br>それでも続けますか？"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "最大高（ｍ）"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "最大幅（ｍ）"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "最大長（ｍ）"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "全てのリモコン操作を手動で確認"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "リモコンプラグインは、常にlocalhostの8111番ポートで待ち受けます。プラグイ"
-#~ "ンと会話をするほかのアプリケーションが参照するので、ポート番号は変更できま"
-#~ "せん。"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "フランスのCadastre WMSからイメージのダウンロード"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "ラスター画像の中央: {0}"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "エラーのあるデータです。それでもアップロードしますか？"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "タグ付けされておらず、かつつながっていないノード"
-
-#~ msgid "Charge"
-#~ msgstr "料金"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "アップロードしたプラグインを有効にできませんでした。JOSMが既存のプラグイン"
-#~ "に上書きできる権限があるかどうか、確認してください。"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ"
-#~ "い。"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "二つ以上の\"from\"ウェイがあります。"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "二つ以上の\"to\"ウェイがあります。"
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "制約条件{0}のスタイルがありません。"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "設定ファイルにエラーがあります。古いファイルのバックアップを{0}に作りま"
-#~ "す。"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n"
-#~ "間で使われるように設計されています。\n"
-#~ "フランスのWMSサーバをつかうのではなければ、\n"
-#~ "ほかの投影法を使用してください。\n"
-#~ "本メッセージ後は、データのアップロードはやめてください。"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "RemoveRelationMember"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "不正なセンテンス: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "不明なセンテンス: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "ゼロ座標: "
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま"
-#~ "すか？"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "異なるメンバーであるウェイを結合しますか？"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "一つも開かれたデータがありませんんで、保存されません。"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "バックアップファイルから復元するときに、エラーになりました。"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "orに引数がありません。"
-
-#~ msgid "Missing argument for not."
-#~ msgstr "not に引数がありません。"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "閉じ括弧があるはずです。"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "オブジェクトの選択、移動および回転"
-
-#~ msgid "layer not in list."
-#~ msgstr "レイヤーがリストにありません。"
-
-#~ msgid "Timespan: "
-#~ msgstr "Timespan: "
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "OSMサーバのベースURL（REST API)"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "WMSプラグインメニューに表示されるWMS サーバのリストを変更"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "メニュー名とWMS URLを入力"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier image id"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>警告：パスワードは平文で設定ファイルに格納されます。<br>パスワード"
-#~ "は、URLに付加されて平文でサーバに送信されます。<br><b>他で使用しているパス"
-#~ "ワードは使用しないでください。</b></html>"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "山岳ハイキング"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "高山ハイキング"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押"
-#~ "した状態で移動させる。選択：クリック。"
-
-#~ msgid "Delete Layer"
-#~ msgstr "レイヤー削除"
-
-#~ msgid "Login"
-#~ msgstr "ログイン"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
-
-#~ msgid "Occupied By"
-#~ msgstr "次によって占められる;"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "site-josm.xmlかWikiページを追加する。"
-
-#~ msgid "Delete and Download"
-#~ msgstr "削除とダウンロード"
-
-#~ msgid "Download Plugins"
-#~ msgstr "ダウンロードプラグイン"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "選択\"{0}\" は、関連 \"{1}\" で使われています。\n"
-#~ "関連から削除しますか？"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し"
-#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "すべての競合に値を入力してください。"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "{1}個のオブジェクト中の{0}個の競合を解決"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} 個のオブジェクトが競合しています:"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "競合中のリレーション"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "競合を解決する"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "インポート中に競合を発見しました。"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "競合点の統合"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "競合: {0}"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "競合の解決"
-
-#~ msgid "Move Down"
-#~ msgstr "下に移動"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "関連の編集者:{0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "矛盾の解決"
-
-#~ msgid "Move Up"
-#~ msgstr "上に移動"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "新しいタグプリセット源をリストに追加する。"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "経由地が複数有ります。"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "指定された順番で設定が読み込まれます。一部のデータがselection以前に\n"
-#~ "読み込まれることにご注意ください。"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "OSMノードやウエイに関する履歴情報の表示"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "ノードの一部は（ほぼ）一直線上にある"
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - 指定されたIDを持つオブジェクト"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - 指定されたノード番号のオブジェクト"
-
-#~ msgid "Update Data"
-#~ msgstr "データの更新"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "次回から選択したエラーを無視する。"
-
-# http://en.wikipedia.org/wiki/Draw_bridge
-#~ msgid "Edit Drawbridge"
-#~ msgstr "跳ね橋の編集"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "強制的に結合"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "異なったメンバーになっているノードを結合しますか？"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告"
-#~ "してください。"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "強制的に連結。"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "ほぼ垂直になっているウェイを選択してください。"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ"
-#~ "ロードされた要素だけに遍歴があります。"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている"
-#~ "か、ダウンロードしましたか？"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "次のエラーは、大量ダウンロードのときに起きました。"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "クリックすると削除。SHIFT: ウェイセグメントを削除。Alt: ウェイを消すときに"
-#~ "ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "OSMにアップロード"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "選択した写真には時間情報がありません"
-
-#~ msgid "Full Screen"
-#~ msgstr "全画面表示"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
-#~ "い。"
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
-#~ "あなたの母国語</A>でそれを作成してください。"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "写真は時間情報を含んでいません。"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- 起動中のバージョンは {0} です。"
-
-#~ msgid "autozoom"
-#~ msgstr "自動ズーム"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "申し訳ありません。匿名のユーザでは利用できません。"
-
-#~ msgid "Invalid projection"
-#~ msgstr "投影法が無効"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に"
-#~ "変えて、再起動してください。"
-
-#~ msgid "Add grid"
-#~ msgstr "グリッドの追加"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "選択されたGPXトラックはタイムスタンプを含んでいません。他のGPXトラックを選"
-#~ "択してください。"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "新しいバグを作成できませんでした。結果： {0}"
-
-#~ msgid "autoload tiles"
-#~ msgstr "タイルの自動読み込み"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "自動ズーム: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "タイルの自動読み込み "
-
-#~ msgid "SlippyMap"
-#~ msgstr "スリッピーマップ"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "スリッピマップ プラグイン用設定"
-
-#~ msgid "Fade background: "
-#~ msgstr "Fade background: "
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "ボタン '{0}' ホットキーの複製  - ボタンは無視されます!"
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "最大ズーム lvl: "
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "ユーザデータを選択したものに置き替えます。"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "著作者パネルを使用してユーザを選んでください。"
-
-#~ msgid "Optional"
-#~ msgstr "オプション"
-
-#~ msgid "Continue anyway"
-#~ msgstr "とりあえず続ける"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "フルスクリーン表示のトグル"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "最初に投影法を {0} に変えてください。"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "順不同の道をコピーできません。"
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "直接JOSMからのTCXファイルをロードしてください。"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "地図グリッドを表示する背景レイヤーを提供します。"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "自動タグのソースを追加しました。:"
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ"
-#~ "ダーを調整して、手動で写真に合わせることができます。"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "ガイドポスト(ハイキング)"
-
-#~ msgid "Map Type"
-#~ msgstr "マップタイプ"
-
-#~ msgid "Default Values"
-#~ msgstr "デフォルトの値"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "建物のフットプリントの抽出"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "厳しい高山ハイキング"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "厳しい山岳ハイキング"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "困難な高山ハイキング"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "厳しい高山ハイキングの編集"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "厳しい山岳ハイキングの編集"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "高山ハイキングの編集"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "ハイキングの編集"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "山岳ハイキングの編集"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "困難な高山ハイキングの編集"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "案内所の編集"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "ルートノードの削除"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "クリックとドラッグでルートノードの移動"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "クリックしてルートノードの追加"
-
-#~ msgid "Start routing"
-#~ msgstr "ルーティングの開始"
-
-#~ msgid "<multiple>"
-#~ msgstr "<multiple>"
-
-#~ msgid "Edit Airport"
-#~ msgstr "空港の編集"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "トラック グレード 2の編集"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "トラック グレード 3　の編集"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "トラック グレード 4　の編集"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "トラック グレード 5 の編集"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "トラック グレード 3"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "トラック グレード 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "トラック グレード 4"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "トラック グレード 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "トラック グレード 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "トラック グレード 1　の編集"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "城の格子戸の編集"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "OpenLayers の背景画面を表示"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr ""
-#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "エリアの結合：　短いウェイの削除"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "現在最大2つまでのエリアのみ結合できます。"
-
-#~ msgid "Fix relations"
-#~ msgstr "リレーションの修正"
-
-#~ msgid "Closed Way"
-#~ msgstr "閉じたウェイ"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(時差 {0} 日)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り"
-#~ "替え);Shft-Ctrlで選択を回転。;選択を変更。"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - その名前の内 'Bak' でない。"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
-#~ "た。\n"
-#~ "確認して、必要なら訂正してください。"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>擬似変更 'disabled' は、次に起こったときにショートカットを無効にしま"
-#~ "す。</p>"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "市/町/村 {0} はWMSに見つからないか、入手不可能です。\n"
-#~ "入手可能かは、www.cadastre.gouv.fr で確認してください。"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。"
-#~ "</html>"
-
-#~ msgid "Download List"
-#~ msgstr "リストをダウンロードする"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "米Yahoo (WebKit GTK)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "米Yahoo (GNOME Fix)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr "投影法が設定から読み取れません。メルカトル図法を使います。"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。"
-
-#~ msgid "linked"
-#~ msgstr "継げられた"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ChangeRelationMemberRole"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "投影法 \"{0}\" は、\n"
-#~ "緯度 45.7°から 47.9°で\n"
-#~ "経度  5.7°から 10.6°まで用です。\n"
-#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n"
-#~ "違う投影系を使ってください。\n"
-#~ "このメッセージ以降のデータはアップロードしないでください。"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "これは、プロトコールバージョン 0.5 と 0.6 をサポートしていますが、サーバー"
-#~ "は、 {0} から {1}をサポートするといっています。"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "リレーション {0}のメンバーに属性\"ref\"がかけています。"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "diffアップロードのための変更セットを用意できませんでした。"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "OSMデータにバージョン番号が欠けています。"
-
-#~ msgid "Not initialized"
-#~ msgstr "初期化されていません。"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "不明な理由でデータのアップロードに失敗しました。"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "応答から数値を読み取れません。"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "不明なバージョン: {0}"
-
-#~ msgid "More details"
-#~ msgstr "もっと詳細"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr "投影法が設定から読み取れません。メルカトル図法を使います。"
-
-#~ msgid "Goods"
-#~ msgstr "貨物トラック"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "ジオタグのある写真"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "標準とは別の JOSM 用ジオタグ plugin。GPS ログと、写真の EXIFに埋め込まれた"
-#~ "ジオタグを関連づけします。"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEAのインポートに失敗しました。"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "TangoGPS のインポートに失敗しました。"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があ"
-#~ "ります。"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} 個のプラグインのダウロードに成功しました。JOSMを再起動してください。"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
-#~ "warntime'を編集することで変更できます）"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "現在の変更数が最大値を越えました。変更数の現在値は {0}で、最大値は {1}で"
-#~ "す。"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "プリミティブ{1}のタグ\"{0}\"の値の長さが最大値を超えています。有効な長さは"
-#~ "{2}です。値の長さは{3}です。"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初"
-#~ "の{0}だけです。"
-
-#~ msgid "Download referrers..."
-#~ msgstr "参照をダウンロード..."
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められ"
-#~ "ます。"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "パラメータ ''{0}'' はヌルでなければなりません"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">"
-#~ "あなたの言語</A>で作成してください。"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>ファイル ''{0}'' が読み込めません。<br> エラー内容: <br>{1}</html>"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "{0} {1} だけを同期"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr ""
-#~ "<html>レイヤー ''{0}' に未解決の競合があります。<br>最初に競合を解決してく"
-#~ "ださい。<html>"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "現在開かれている変更セットはありません。"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "現在の変更セットを閉じる ..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "現在の変更セットを閉じる"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "新しい変更セットを使用して開いたままにする"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後"
-#~ "に変更セットを閉じる"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "新しい変更セットを使用して閉じる"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後"
-#~ "に変更セットを閉じる"
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "新規または既存の変更セットにアップロードしますか？"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ"
-#~ "トを閉じる"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた"
-#~ "めに変更セットを開いておく"
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。"
-#~ "<br>変更セットはタイムアウト後にサーバによって自動的に閉じられます。</"
-#~ "html>"
-
-#~ msgid "Changeset {0} is unchanged. Skipping update."
-#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。"
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..."
-
-#~ msgid "Reusing existing changeset {0}"
-#~ msgstr "既存の変更セット {0} を再利用しています"
-
-#~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
-#~ msgstr ""
-#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
-
-#~ msgid "Closing changeset {0}..."
-#~ msgstr "変更セット {0} を閉じています..."
-
-#~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the "
-#~ "id of the current changeset is 0"
-#~ msgstr ""
-#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更"
-#~ "セットのIDが 0 です。"
-
-#~ msgid "Leaving changeset {0} open..."
-#~ msgstr "変更セット {0} を開いたままにします.."
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
-
-#~ msgid "Update Selection"
-#~ msgstr "選択を更新"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "サーバから現在選択されたプリミティブを更新"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "現在のデータセット中には ID {0} のプリミティブが見つかりません"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "OSM API へのアップロード失敗"
-
-#~ msgid "Updating primitive"
-#~ msgstr "プリミティブ更新中"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "パラメータ ''{0}'' はヌルでなければなりません"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "次のエラーが一括ダウンロード中に発生しました: {0}"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "削除または移動されたプリミティブ"
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくだ"
-#~ "さい、例えば ノード: 10-20"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "常に移動し、ダイアログ表示は不要"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "データがロードされていないので検索できません。"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "サーバとの通信中にエラー。"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "ダウンロード中に競合"
-
-#~ msgid "Conflict detected"
-#~ msgstr "競合が検出されました"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "相手の表示状態を残す"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "自分の表示状態を残す"
-
-#~ msgid "Visible State:"
-#~ msgstr "表示状態:"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "表示状態間の競合を未決にする"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "未決の競合を解決できません"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "はい、破棄します"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
-#~ "ションから削除しますか？</html>"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "{0} のプリミティブを復活"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "ノード {0} のバージョン競合を解決"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "プリミティブ ''{0}'' には既に競合が登録されています"
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "id=0 のプリミティブは非表示にできません"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例"
-#~ "外の内容: {1}"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "不正なid演算子の値: {0}。数字を入力してください。"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "リレーション {0} のバージョン競合を解決"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "ウェイ {0} のバージョン競合を解決"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリ"
-#~ "ではありません。"
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレク"
-#~ "トリではありません。</html>"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "前のバージョンがありません。履歴は空です。"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "このデータセットには id {0} バージョン {1} のプリミティブはありません"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "最新のバージョンがありません。履歴は空です。"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "このデータセットには id {0} のプリミティブはありません"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "ウェイ {0} のノードリストの競合を解決"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "データセットから削除"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "ローカルデータセットから物理的に削除"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "現在のデータセット内で選択された全プリミティブを最初に選択されたメンバーの"
-#~ "前に追加"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "現在のデータセット内で選択された全プリミティブを最後に選択されたメンバーの"
-#~ "後に追加"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリ"
-#~ "ミティブごとにリクエストするには、無効にする。"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "一度のリクエストで全ての変更をアップロードしました。"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0}個のオブジェクトを変更:"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>あなたのローカルセットにある{0} 個のプリミティブが、<br>おそらくサー"
-#~ "バーでは削除されています。これらをあとで削除したり、更新しようとすると、"
-#~ "サーバーは<br>競合<br>と報告するでしょう。<br>サーバー上のこれらのプリミ"
-#~ "ティブの状態を確認するには<br><strong>{1}</strong>をクリックしてくださ"
-#~ "い。 <br>無視するには、<strong>{2}</strong>をクリックしてください。<br></"
-#~ "html>"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>ブックマークを書き込めません。<br>{0}</html>"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "プリミティブは削除済み"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>リモートサーバ<br>''{0}''<br>への接続にセキュリティ上の理由で接続を"
-#~ "開けませんでした。おそらくアプレットを実行しているがアプレットを ''{1}' か"
-#~ "らロードしていないためだと思われます。</html>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>アップロード <strong>失敗</strong> サーバから削除しようとしたプリミ"
-#~ "ティブは既に削除されています。<br><br>エラーメッセージ:<br>{0}</html>"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "タグ({0} 競合)"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr "自分の選択した要素を結合された要素リストの最後にコピー"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "自分の選択した要素を、結合された要素リストの最初に選択された要素の後にコ"
-#~ "ピー"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "自分の選択した要素を、結合された要素リストの最初に選択された要素の前にコ"
-#~ "ピー"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコ"
-#~ "ピー"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr "相手の選択した要素を、結合された要素リストの最後にコピー"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了"
-#~ "</html>"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "いいえ、操作をキャンセルします"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr "<html>サーバとの通信中にエラー発生<br>詳細: {0}</html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "サーバとの通信失敗"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "非表示(サーバ上)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "表示(サーバ上)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "ローカルバージョンのクローンを残す"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "id を0 にリセット"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "はい、id をリセットします"
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "パラメータ ''{0}'' は空以外でなければなりません"
-
-#~ msgid "No, don't apply"
-#~ msgstr "いいえ、適用しません"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "どちらの値を残すか決定してください"
-
-#~ msgid "not yet decided"
-#~ msgstr "未決定です"
-
-#~ msgid "History item"
-#~ msgstr "履歴アイテム"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "アイテム {0} はリストに見つかりません"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "はい、これも削除を取り消します"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "追加のノードの削除を取り消しますか？"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "結合された要素のリスト固定を解除して結合をはじめる"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始"
-#~ "</html>"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "結合された要素の現在のリストを固定"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "結合された要素のリストから選択したエントリを削除"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "同じ位置で選択した要素を上に移動"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "同じ位置で選択したエントリを下に移動"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "依存するプリミティブの削除を取り消しますか？"
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "キー ''{0}'' とその全ての値は削除されます"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>あなたのローカルバージョンを残すために、JOSMは<br>プリミティブ {0} "
-#~ "のID を0にリセットしなければなりません。<br>次回のアップロード時にサーバが"
-#~ "新しいidを割り当てます。<br>よろしいですか？</html>"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM はid {0} のあなたのローカルプリミティブをデータセットから<br>削"
-#~ "除しなければなりません。<br>よろしいですか？</html>"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "結合されたノードはまだ固定されていません。解決コマンドをビルドできません"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "未決のタグ結合アイテムを適用できません"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr ""
-#~ "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr ""
-#~ "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してく"
-#~ "ださい"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "選択されたプリミティブの履歴を表示"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "範囲外のインデックス。{0} を受け取りました"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "このユーザが登録したプリミティブを選択"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>子リレーション<br>{0}<br>はサーバ上から削除されました。ロードできま"
-#~ "せん"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "データ内の競合"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "複数のメンバーが同じプリミティブを参照しています"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "選択されたリレーションメンバーのプリミティブを選択"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>レイヤー ''{0}''には既にプリミティブ ''{1}'' <br>に競合があります。"
-#~ "<br>最初にこの競合を解決してからやり直してください。</html>"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "現在選択されているタグを削除"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>空のロールを {0} プリミティブにセットしようとしています。<br>これは"
-#~ "ロールを削除することになります。<br>新しいロールを本当に適用しますか？</"
-#~ "html>"
-
-#~ msgid "Linked"
-#~ msgstr "リンク済み"
-
-#~ msgid "child.id >0 expected. Got {1}"
-#~ msgstr "子id > 0 でなければなりません。{1} を受け取りました"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr "警告: タスクがキャンセルされたので例外を無視。例外: "
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
-
-#~ msgid "id > 0 expected, got {0}"
-#~ msgstr "id > 0 でなければなりませんが、{0} を受け取りました"
-
-#~ msgid "Layer ''{0}'' has no modifications to be saved"
-#~ msgstr "レイヤー ''{0}'' には保存する修正はありません"
-
-#~ msgid ""
-#~ "Layer ''{0}'' has modifications which should be saved to its assoicated "
-#~ "file ''{1}''."
-#~ msgstr ""
-#~ "レイヤー ''{0}'' は修正されているのでその関連ファイル ''{1}'' に保存する必"
-#~ "要があります。"
-
-#~ msgid "Layer ''{0}'' has no modifications to be uploaded"
-#~ msgstr "レイヤー ''{0}'' にはアップロードする修正はありません"
-
-#~ msgid "Save and Delete"
-#~ msgstr "保存と削除"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "プリミティブアップロード準備中"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) プリミティブ {2} の親要素をロード中"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "OSMデータレイヤーかGPXレイヤーのインスタンスであると期待しています。 "
-#~ "''{0}''を得ました。"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "デフォルト(詳細はツールチップ参照)"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "リストに新しいXML ソースを追加。"
-
-#~ msgid "Copy defaults"
-#~ msgstr "デフォルトをコピー"
-
-#~ msgid "Icon paths"
-#~ msgstr "アイコンのパス"
-
-#~ msgid "Could not export \"{0}\""
-#~ msgstr "\"{0}\" をエクスポートできません"
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "id {0} のプリミティブはローカルデータセットにはありません。プリミティブタ"
-#~ "イプ不明"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "設定 ''{0}'' がみつかりません。OsmApi を初期化できません"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "OSM アカウントへのログイン名(e-mail)。"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM ユーザ名 (e-mail)"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "必須の属性 ''{0}'' がありません"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "id {0} のOSM プリミティブに属性 \"version\" がありません"
-
-#~ msgid "Unknown relation member type {0}"
-#~ msgstr "不明なリレーションメンバーのタイプ {0}"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "API {0} への接続に失敗しました"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr ""
-#~ "{0} という名前のプラグインは利用できません。更新はスキップされました。"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "{0} プラグインのロードが要求されました。このプラグインは今は必須ではありま"
-#~ "せん。"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "サーバがエラーを返しました。コード {0}"
-
-#~ msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-#~ msgstr "<html>保存中にエラー発生。<br>エラー: <br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>バックアップファイルのレストア中にエラー発生。<br>エラー: <br>{0}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>警告: パスワードは設定ファイルに平文で保管されています。<br>パスワー"
-#~ "ドはサーバに平文で、URLエンコードされて送信されます。<br><b>重要なパスワー"
-#~ "ドは使用しないでください。</b></html>"
-
-#~ msgid "image "
-#~ msgstr "画像 "
-
-#~ msgid "Confirmation"
-#~ msgstr "確認"
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "ラインの終端に到達"
-
-#~ msgid "Reached a junction"
-#~ msgstr "ジャンクションに到達"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "警告: WMS サービス用のベースURL ''{0}'' には末尾の '&' または '?' がありま"
-#~ "せん。"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "入力されたリンクまたはID を選択されたサービスにマッチさせることができませ"
-#~ "んでした。もう一度試してください。"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "選択されたデフォルトをコピー"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "1 つのプリミティブを破棄"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま"
-#~ "す。<br>リレーションから削除しますか?</html>"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "ウェイ {0}から、参照を取り除く"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>レイヤー ''{0}'' は、既にプリミティブ<br>''{1}''<br>で、競合していま"
-#~ "す。この競合は加えることができません。</html>"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "警告: レイヤー ''{0}'' は、もうぞんざいしません。プリミティブ ''{1}'' での"
-#~ "競合も取り除けません。"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "警告: ウェイ内のノードの数が2を下回ったので、ウェイ {0}を破棄します。現在"
-#~ "は、{1} です。"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "リレーション {0}から、参照を除きます。"
-
-#~ msgid ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-#~ msgstr ""
-#~ "タグコレクションには複数の値を持つキーがあるのでプリミティブに適用できませ"
-#~ "ん"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "タグコレクションには選択された値 ''{0}'' が含まれていません"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr ""
-#~ "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取"
-#~ "りました"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr ""
-#~ "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りまし"
-#~ "た"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr ""
-#~ "パラメータ ''{0}'' > 0 である必要がありますが、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>リモートサーバ<br>''{0}''.<br>への接続を開けませんでした。ホスト名 "
-#~ "''{1}'' を解決できません。<br>設定のAPI URL とインターネット接続をチェック"
-#~ "してください。</html>"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "解決待ちの保留中タグ競合 {0}"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>URL の作成に失敗しました。エンコーディング ''{0}''は<br>このシステム"
-#~ "にはありません。</html>"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>このリレーションには既にひとつ以上の<br>プリミティブ ''{0}'' <br>を"
-#~ "参照しているメンバーがあります。<br>本当に他のリレーションメンバーを追加し"
-#~ "ますか？</html>"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。"
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr ""
-#~ "参照のセットに失敗しました。参照バージョン {0} は履歴で利用できません"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取り"
-#~ "ました"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr "long 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr "boolean 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr "long 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid "parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
-
-#~ msgid "id parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。"
-#~ "例外: {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "ID {0} のOSM プリミティブの属性 \"version\"に不正な値 、 {1} を受け取りま"
-#~ "した"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr ""
-#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし"
-#~ "た。"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "リレーション {1} のメンバー {0} に属性 \"type\" がありません"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>openstreetbus プラグインは appspot.com の古いサーバを使用していま"
-#~ "す。<br>schokokeks.org の新しいサーバが利用できます。<br>新しいサーバに切"
-#~ "り換えますか？ (強く推奨)</html>"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" は閉じられていないので連結できません。"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "ウェイ終端の開始ノードを選択"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "調整するWMSレイヤーを選択してください。"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "現在は調整するWMSレイヤーがありません。"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マッ"
-#~ "プ移動:</b> 右クリックしたままマウスを動かすか、カーソルキーを使用。 <b>選"
-#~ "択:</b> クリック"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "ロール {0} は比較ペア {1} に参加していません"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "ロール {0} のリストは現在比較ペアに参加していません"
-
-#~ msgid ""
-#~ "<html>An upload and/or save operation of one layer with "
-#~ "modifications<br>was cancelled or has been failed.</html>"
-#~ msgstr ""
-#~ "<html>修正されたひとつのレイヤーのアップロード、保存操作は<br>キャンセルさ"
-#~ "れたか失敗しました。</html>"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで"
-#~ "最試行中"
-
-#~ msgid "black"
-#~ msgstr "黒"
-
-#~ msgid "brown"
-#~ msgstr "茶"
-
-#~ msgid "white"
-#~ msgstr "白"
-
-#~ msgid "blue"
-#~ msgstr "青"
-
-#~ msgid "red"
-#~ msgstr "赤"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決して"
-#~ "ください。</html>"
-
-#~ msgid "expected id >= 0. Got {0}"
-#~ msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
-
-#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
-#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''"
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "パラメータ''{0}'' はヌルでなければなりません"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "ノード {0} を不完全なウェイ {1} に追加できません"
-
-#~ msgid "version > 0 expected. Got {0}"
-#~ msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
-
-#~ msgid "id > 0 expected. Got {0}"
-#~ msgstr "ID > 0 である必要があります。 {0} を受け取りました"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr ""
-#~ "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りまし"
-#~ "た"
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "ノードの結合時に競合 - 結合されたノードは''{0}'' です"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr "最初に選択されたメンバーが参照しているプリミティブにズーム"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マッ"
-#~ "プを移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>"
-#~ "選択:</b> 左クリックしたままフレームをドロー。"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "不正なアップロードコメント"
-
-#~ msgid "Missing mandatory attribute ''{0}''"
-#~ msgstr "必要な属性 ''{0}'' がありません"
-
-#~ msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-#~ msgstr "XML 要素 {1} に必要な属性 ''{0}'' がありません"
-
-#~ msgid "Missing attribute ''type'' on member {0} in relation {1}"
-#~ msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
-
-#~ msgid "Missing attribute ''ref'' on member in relation {0}"
-#~ msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
-
-#~ msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-#~ msgstr ""
-#~ "警告: 未定義の要素 ''{0}'' が入力ストリームに見つかりました。スキップしま"
-#~ "す。"
-
-#~ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
-
-#~ msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-#~ msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません"
-
-#~ msgid "Unknown or unsupported API version. Got {0}"
-#~ msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got "
-#~ "{1}"
-#~ msgstr "ID {0} のOSM プリミティブの ''version'' 属性に不正な値。入力値: {1}"
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''"
-#~ msgstr ""
-#~ "外部ID ''{0}'' のリレーションが外部ID ''{1}'' の存在しないプリミティブを参"
-#~ "照しています"
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-#~ msgstr ""
-#~ "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
-
-#~ msgid "create new objects"
-#~ msgstr "新しいオブジェクトを作成"
-
-#~ 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 ""
-#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがありま"
-#~ "す。\n"
-#~ "これはノードを誤って削除する可能性があります。\n"
-#~ "本当に続けますか？"
-
-#~ 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] "選択には {0} ウェイが含まれます。本当に簡略化しますか？"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "このテストは同じタグで同じノード座標が無いことをチェックしています。"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョ"
-#~ "ン {2} の相手のプリミティブは表示されません。この不整合を解決できません。"
-#~ "自分のプリミティブを残します。 "
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>サーバーから削除されたウェイ{1}に<br>付加された {0} 個のノードがあり"
-#~ "ます。<br><br>これらのノードも復活させたいですか?</html>"
-
-#~ msgid "pos {0} is out of range. current number of members: {1}"
-#~ msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}"
-
-#~ msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-#~ msgstr ""
-#~ "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されていま"
-#~ "す。 {1} を受けとりました。"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>サーバーから削除されたリレーション{1}に<br>参照されていた {0} 個のプ"
-#~ "リミティブがあります。<br><br>これらも復活させたいですか?</html>"
-
-#~ msgid "Tag modified relations with   "
-#~ msgstr "タグは、次のものでリレーションを変更しました:   "
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>このリレーションの少なくともひとつメンバーは、<br>自身のリレーション"
-#~ "を参照しています。<br>これは循環参照を引き起こすため、推奨されません。<br>"
-#~ "循環参照をどうしますか？</html>"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "パラメータ \"index\" におかしな値。入力値: {0}"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "おかしな形式のID がサーバから返されました。入力値: ''{0}''"
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "変更されたプリミティブ ''{0}'' の新しいバージョンにおかしな形式。入力値: "
-#~ "''{1}''"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "おかしなカラムインデックス。入力値: {0}"
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が"
-#~ "見つかりません。"
-
-#~ msgid "Used style"
-#~ msgstr "使用スタイル"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供しま"
-#~ "す。タグ名用にスペルチェック機能が統合されています。"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM ゾーン {0}"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-#~ msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">"
-#~ "あなたの言語</A>で作成してください。"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "このデータセットには id {0} のプリミティブはありません"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>でそれを作成してくださ"
-#~ "い。"
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
-#~ "あなたの母国語</A>でそれを作成してください。"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>アップロードに<strong>失敗</strong>。 {1} で既に閉じられた変更セッ"
-#~ "ト {0} を<br>使用していたためです。<br>新規または既存の開かれた変更セット"
-#~ "を再度アップロードしてください。"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "フィルター文字列を入力してください。"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "警告: レイヤー ''{0}'' はもはや存在しません。プリミティブ  ''{1}'' の競合"
-#~ "は削除不可。"
-
-#~ msgid "Text"
-#~ msgstr "テキスト"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} リレーションが相互に参照しあっており、循環を形成しています。"
-#~ "<br>JOSM はこれをアップロードできません。リレーションを編集して相互依存を"
-#~ "解消してください。</html>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>アップロードに<strong>失敗</strong>。既に {1} で閉じられた<br>変更"
-#~ "セット {0} を使用しています。<br>新規または既存の開かれた変更セットで再度"
-#~ "アップロードしてください。</html>"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''"
-#~ msgstr ""
-#~ "警告: レイヤー ''{0}'' は既に存在しません。プリミティブ ''{1}'' の競合を解"
-#~ "消できません"
-
-#~ msgid "Apply also for children"
-#~ msgstr "子へも適用"
-
-#~ msgid "child.getId() >0 expected. Got {1}"
-#~ msgstr "child.getId() >0 であるべきです。入力値 {1}"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "新しい変更セットを開く"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "既に開かれた変更セットにデータをアップロード"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "開かれた変更セットを使用"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "ひとつのリクエストで全ての変更をアップロード"
-
-#~ msgid "changeset id > 0 expected. Got {1}"
-#~ msgstr "変更セット ID > 0 であるべきです。入力値: {1}"
-
-#~ msgid "missing mandatory attribute ''{0}''"
-#~ msgstr "必須の属性 ''{0}'' がありません"
-
-#~ msgid "illegal value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "属性 ''{0}'' に不正な値。入力値: ''{1}''"
-
-#~ msgid "Changeset id > 0 expected. Got {0}"
-#~ msgstr "変更セットID > 0 であるべきです。入力値: {0}"
-
-#~ msgid "Open changeset expected. Got closed changeset with id {0}"
-#~ msgstr ""
-#~ "変更セットは開かれているべきです。ID {0} の閉じられた変更セットが入力され"
-#~ "ました"
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "変更セットのID > 0 であるべきです。入力値: {0}"
-
-#~ msgid "parameter ''{0}'' > 0 expected. Got {1}"
-#~ msgstr "パラメータ ''{0}'' > 0 であるべきです。入力値: {1}"
-
-#~ msgid "id of current changeset > 0 required. Current id is {0}"
-#~ msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "現在の変更セットはヌルです。データをアップロードできません。"
-
-#~ msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "属性 ''{0}'' に不正な数値。入力値: ''{1}''"
-
-#~ msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "属性 ''{0}'' に不正なブール値。入力値: ''{1}''"
+#~ "プラグイン cadastre-fr は取得キーのショートカット F11をこれまで使用してお"
+#~ "り\n"
+#~ "これは現在デフォルトでフルスクリーンスイッチに割り当てられています。\n"
+#~ "F11 を取得アクションに戻しますか？"
 
 #~ msgid ""
 #~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "要素 ''bounds'' に必須の属性がありません。入力値: minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
+#~ "要素 ''bounds'' に必要な属性がありません。入力値: minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
+
+#~ msgid "Changeset"
+#~ msgstr "変更セット"
 
 #~ msgid ""
-#~ "way with external id ''{0}'' includes missing node with external id "
-#~ "''{1}''"
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+#~ msgstr "警告: リビジョンファイルに予期せぬJOSMバージョン番号、値は ''{0}''"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "外部ID ''{0}'' のウェイは外部ID ''{1}'' の不明なノードを含んでいます"
-
-#~ msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-#~ msgstr "要素 <nd> の属性 ''ref'' に不正な値。 入力値: {0}"
-
-#~ msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
-#~ msgstr "XMLタグ ''{1}'' の属性 ''{0}'' がありません"
-
-#~ msgid "XML tag <user> is missing"
-#~ msgstr "XMLタグ <user> がありません"
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr "エラー: 接続する認証信任状の追加に失敗。"
+#~ "警告: リソース ''/data/{0}''のための入力ストリームの open に失敗しました。"
+#~ "NTF<->RGF93 グリッドを読み込めません。"
 
 #~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to "
-#~ "version 0.6"
-#~ msgstr ""
-#~ "警告: アップロードするデータにAPIバージョンが定義されていません。バージョ"
-#~ "ン0.6 にフォールバックします。"
-
-#~ msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
-#~ msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "警告: 設定 ''{0}'' またはデータセットのAPIバージョン ''{1}'' では差分アッ"
-#~ "プロードが必要ですが、API が対応していません。差分アップロードを無視しま"
-#~ "す。"
-
-#~ msgid "All:"
-#~ msgstr "すべて:"
-
-#~ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-#~ msgstr "ウェイ {1} の<nd>に必要な属性 ''{0}'' が見つかりません"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "''{0}'' を探した結果何も見つからなかった"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "ガウス-ラボルド会議1947"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html>バージョン <strong>{0}</strong> は変更セット <strong>{3}</strong> "
-#~ "の <strong>{2}</strong> によって <strong>{1}</strong> 上で作成された</"
-#~ "html>"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "id=0 のプリミティブは非表示にできません"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りまし"
-#~ "た"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr ""
-#~ "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取"
-#~ "りました"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りまし"
-#~ "た"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "前のバージョンがありません。履歴は空です。"
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "最新のバージョンがありません。履歴は空です。"
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr ""
-#~ "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "パラメータ ''{0}'' は空以外でなければなりません"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されていま"
-#~ "す。 {1} を受けとりました。"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "タグコレクションには選択された値 ''{0}'' が含まれていません"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "範囲外のインデックス。{0} を受け取りました"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "選択されたプリミティブの履歴を表示"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "\"{0}\"を読み込めません。"
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "id {0} のプリミティブはローカルデータセットにはありません。プリミティブタ"
-#~ "イプ不明"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで"
-#~ "最試行中"
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "設定 ''{0}'' がみつかりません。OsmApi を初期化できません"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr ""
-#~ "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "osmサーバに接続できません。インターネット接続 をチェックしてください。"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr "属性 ''{0}'' に不正な数値。入力値: ''{1}''。"
-
-#~ msgid ""
-#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-#~ msgstr ""
-#~ "要素 ''bounds'' に必要な属性が見つかりません。入力値: minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''."
-#~ msgstr ""
-#~ "外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参"
-#~ "照しています。"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アッ"
-#~ "プロードの使用が必須ですが、API は取扱えません。差分アップロードを無視しま"
-#~ "す。"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N (仏領)グアドループ海外県 Sainte-Anne 市 1948"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "予期せぬカラムインデックス。入力値: {0}"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴の"
-#~ "ページにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" "
-#~ "です。"
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま"
-#~ "す。"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "トラック"
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "{1} ノードのウェイ {0} は不完全です。ロードされたデータに少なくとひとつの"
-#~ "ノードが見つからないため、不完全です。"
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
-#~ msgstr ""
-#~ "キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry "
-#~ "を復元できません。"
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定"
-#~ "から window geometry を復元できません。"
-
-#~ msgid ""
-#~ "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コー"
-#~ "ド: {2}。設定から window geometry を復元できません。"
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "キー ''{0}'' の設定が存在しません。設定から window geometry を復元できませ"
-#~ "ん。"
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
-#~ "geometry にフォールバックします。詳細: {1}"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必"
-#~ "要です\n"
-#~ "     Javaの使用メモリ最大サイズを増やすオプション"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "結合したノードがまだ固定されていません。解決コマンドをビルドできません"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "結合したノードはまだ固定されていません。解決コマンドをビルドできません"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)"
-
-#~ msgid "Processing {0}"
-#~ msgstr "{0} 実行中"
-
-#~ msgid "Relation: from {0} to {1} via {2}"
-#~ msgstr "リレーション: {0} から {1} まで {2} 経由"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "結合させるクローズドノードを最低ひとつ選んでください。"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "最低4ノード以上の単一のクローズドウェイを選択"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>このWMS レイヤー用のベースURL<br>''{0}''<br>の終わりに ''&'' や "
-#~ "''?'' を付けてはなりません。<br>そうすると不正なWMSリクエストとなる場合が"
-#~ "あります。設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しま"
-#~ "すか？"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ"
-#~ "ニューに表示されます。\n"
-#~ "\n"
-#~ "高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\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"
-#~ "フル WMS URL 入力フォーマット例 (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連す"
-#~ "る 'id' を入力するだけです。\n"
-#~ "Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のよう"
-#~ "なURL を生成してください、73 のところはあなたの画像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"
-#~ "お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでくださ"
-#~ "い。"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景と"
-#~ "してロードし、更新を要求できます。"
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エ"
-#~ "リア結合、ポジションへのジャンプ"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr "地理参照画像をJOSM の背景として表示（WMS サーバ、Yahoo,...）。"
-
-#~ msgid "Bikes"
-#~ msgstr "自転車"
-
-#~ msgid "Travel"
-#~ msgstr "旅行"
-
-#~ msgid "Man-Made"
-#~ msgstr "建造物"
-
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} 経由ノード。"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
-
-#~ msgid "Via node {0}, {1}"
-#~ msgstr "経由ノード {0}, {1}"
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr "グループ共通のアドレス補間をひとつのダイアログに入力します。"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できませ"
-#~ "ん。"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr ""
-#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリス"
-#~ "トしており、あなたのキーボード上にあるキーではないことにご注意ください。あ"
-#~ "なたのキーボード上にある実際のキーに対応する値だけを使用してください。もし"
-#~ "あなたのキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、"
-#~ "Sun のキーボードにはあります)、使用しないでください。 また、あなたのキー"
-#~ "ボード上のショーツカットに対応するリストされた'key' もあります。(例： ':'/"
-#~ "Colon)。これも同様に使わないでください。代わりにベースキー(US キーボード"
-#~ "の';'/Semicolon 、ドイツキーボードの '.'/Period 、...) を使ってください。"
-#~ "そうしないと競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and "
-#~ "Ctrl+: がUS キーボードでは実際には同じことだと知る手立てが無いのです...</"
-#~ "p>"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "サーバーからの新しいデータで、データレイヤーのデーターを更新する。(データ"
-#~ "の再ダウンロード)"
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} レイヤーは保存が必要ですが<br>書き込み不可の<br>関連するファイル"
-#~ "があります。<br>このレイヤー用の他のファイルを選択するか変更を破棄してくだ"
-#~ "さい。<br>書き込み不可のファイルのあるレイヤー:</html>"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "結合する少なくとも二つのウェイを選択してください。"
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "経由地かウェイが見つかりません。"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "領域を指定するウェイが閉じていません。"
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "ウェイの複製"
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "オフセットのあるウェイを複製"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>最終ページはJOSM が自動的にショートカットに割り当てる修飾を一覧表示して"
-#~ "います。4種のショートカットごとに3つの代替案があります。JOSM は競合を管理"
-#~ "する際、リスト順にこれらの代替案を試します。全ての代替案が既に割り当てられ"
-#~ "たショートカットになった場合、代わりにランダムなショートカットを割り当てま"
-#~ "す。</p>"
-
-#~ msgid "MIddle way: {0}"
-#~ msgstr "中間のウェイ: {0}"
-
-#~ msgid "{0} extrem nodes."
-#~ msgstr "{0} 極値ノード。"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "結合された自己重複エリア"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: "
-#~ "''{0}''。"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除け"
-#~ "ません。"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "WMSレイヤーを選択"
-
-#~ msgid "any substance"
-#~ msgstr "どれかの実体"
-
-#~ msgid "overground"
-#~ msgstr "地上"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "オブジェクト ''{0}'' を取り除いた。"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないか"
-#~ "らです。"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
-#~ "ティブをスキップし、アップロードを再試行します。"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "リレーション {0} からリファレンスを削除する"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "{0} 個のオブジェクトを取り除いた。"
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} 個のオブジェクトはサーバから削除されましたので、ローカルなデータセット"
-#~ "から放棄されました。"
-
-#~ msgid "tower"
-#~ msgstr "送電塔"
-
-#~ msgid "underwater"
-#~ msgstr "水中"
-
-#~ msgid "minor_line"
-#~ msgstr "細い線"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "選択したファイルはのひとつはヌルでした !!!"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>このリレーションは編集画面以外で変更されています。<br>変更を適用して"
-#~ "編集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</"
-#~ "html>"
-
-#~ msgid "Footway"
-#~ msgstr "遊歩道"
-
-#~ msgid "line"
-#~ msgstr "線"
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "種別が見つかりません。履歴は空です。"
-
-#~ msgid "longitude"
-#~ msgstr "経度"
-
-#~ msgid "latitude"
-#~ msgstr "緯度"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "{0} ブラウザウィンドウを起動しようとしています。<br>画面がブラウザウィンド"
-#~ "ウで散らかり<br>終わらせるのに少し時間が掛かります。"
-
-#~ msgid "Coordinate"
-#~ msgstr "座標"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "OSMから参照をダウンロードします..."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "どのウェイも接着していません。"
-
-#~ msgid "Update selections"
-#~ msgstr "選択を更新"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "サーバから現在のデータレイヤーのオブジェクトを更新します。"
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr "現在の選択の変更を全てOSM サーバにアップロード。"
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "現在のデータレイヤーの変更を全てOSM サーバにアップロード"
-
-#~ msgid ""
-#~ "Please consult the Conflict List Dialog<br>and manually resolve them."
-#~ msgstr "競合リストダイアログを見て<br>手動で解決してください。"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "更新用に選択されたプリミティブがありません。"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>アップロード <strong>失敗</strong>: あなたが<br>チェンジセット {0} "
-#~ "を使用しています。それはすでに {1} に閉じられましたので、<br>もう一度新規"
-#~ "または既に開いている変更セットをアップロードしてください。</html>"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "新しいレイヤーにデータをダウンロードするなら選択"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "現在のデータセットには ID {0} のオブジェクトがありません"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
-
-#~ msgid "Failed to read command. Exiting help browser. Exception was:"
-#~ msgstr "コマンド読込に失敗しました。ヘルプブラウザを終了中。例外コード:"
-
-#~ msgid "Failed to launch the external help browser"
-#~ msgstr "外部ヘルプブラウザの起動に失敗"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "アップロード用コメントを入力(最小3文字)"
-
-#~ msgid ""
-#~ "<html>The server reported that it has detected a conflict.<br>Error "
-#~ "message (untranslated):<br>{0}"
-#~ msgstr ""
-#~ "<html>サーバから競合検出の報告がありました。<br>エラーメッセージ(未翻訳):"
-#~ "<br>{0}"
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "少なくとも2つのウェイを選択してください。"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "マルチポリゴンをワンクリックで作成し、リレーションエディタによる通常のやり"
-#~ "方よりはるかに簡単です。"
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>プラグイン {0} が読み込まれました。<br>このプラグインは開発を終了し"
-#~ "ていて、問題を起こす可能性があります。<br>無効にしてください。<br>使用をや"
-#~ "めますか？</html>"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ID > 0 が必須です。入力値 {0}"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "{0} オブジェクトを追加しました"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "{0} オブジェクトをアップロード中 ..."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "パラメータ ''{0}'' は空ではダメです"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "不正なダブル値 ''{0}''"
-
-#~ msgid "null detected in node list"
-#~ msgstr "ノードリストにヌルが見つかりました"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr ""
-#~ "削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取"
-#~ "りました"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
-
-#~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを比較できません。"
-
-#~ msgid "User with the same uid but different name found"
-#~ msgstr "同じuidで異なる名前のユーザが見つかりました"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}"
-
-#~ msgid "Could not create a node with the entered latitude/longitude."
-#~ msgstr "入力された緯度/経度のノードを作成できませんでした。"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "全画面ビューを切り替え"
-
-#~ msgid "Illegal lat/lon value"
-#~ msgstr "不正な緯度/経度の値"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "全画面ビュー"
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
-
-#~ msgid "Downloading relation ''{0}''"
-#~ msgstr "リレーション''{0}'' をダウンロード中"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "利用可能な翻訳を探しています ..."
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} プラグインがダウンロードされました。"
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "JOSMを再起動してください。"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr ""
-#~ "マルチポリゴンはクローズドウェイだけから構成されていなければなりません"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "最小ズームレベル: "
-
-#~ msgid "gray"
-#~ msgstr "グレー"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "-90から90の範囲で緯度を入力してください"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "-180から180の範囲で正しい経度を入力してください"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "-90から90の範囲で正しい緯度を入力してください"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "-180から180の範囲で経度を入力してください"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "ダイアログを閉じて、新しいノードを作成しない"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "長さ4の配列が期待されています、入力値{0}"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "エラー: サーバからのブックマークリストに予期せぬ行 ''{0}''"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "エラー: サーバからのブックマークリストの行 ''{1}'' に不正なダブル値 "
-#~ "''{0}''"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "ウェイセグメントをドラッグして長方形を作成。Ctrl+ドラッグで垂線に沿ってセ"
-#~ "グメントを移動。"
-
-#~ msgid "Missing right parent"
-#~ msgstr "正しい親が見つかりません"
-
-#~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
-#~ msgstr ""
-#~ "変更セットID > 0 は新しいプリミティブには割り当てられません。変更セットの"
-#~ "値は {0}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "パラメータ ''{0}'' >= 0 が期待されています、入力値 {1}"
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "あなたのOSMアカウントのパスワードを入力してください"
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr "変更セット演算子の不正な値: {0}。 数値が期待されています。"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (フランス)"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "tags演算子用のパラメータ数値誤り。"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "tags演算子の不正な値: {0}。 tags 演算子はタグ数または範囲が期待されていま"
-#~ "す、例 tags:1 または tags:2-5"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "ウェイ {0} 用に'変更された'フラグをセット"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "リレーション {0} 用に'変更された'フラグをセット"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "ノード {0} 用に'変更された'フラグをセット"
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "異なるIDのプリミティブはマージできません。こちらのIDは{0}です、相手は {1}"
-#~ "です"
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: リレーションをダウンロード中 ''{2}''..."
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "パラメータ ''{0}'' 中のID > 0 が期待されています、入力値 {1}."
-
-#~ msgid "Warning: bad location in HTML document. Exception was: "
-#~ msgstr "警告: HTMLドキュメント中に不正な位置。例外コード: "
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>現在のダウンロードエリア</strong> (最小緯度, 最小経度, 最大"
-#~ "緯度, 最大経度): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr ""
-#~ "<html>ディレクトリをオープンできません。<br>ファイルを選択してください！"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "右括弧がありません"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "{0} ファイルを開いています..."
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "バージョン演算子の不正な値: {0}。数値が期待されています。"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "位置精度低下 (HDOP) によって、点とトラックセグメントの配色をおこなう。使用"
-#~ "しているGPS機器がこの情報を記録している必要があります。"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "これより短いウェイでは方向の矢印を描画しない。"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "一方通行など、必要なときのみ向きを表示"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>また、ショートカットの割り当ては、アプリケーション起動時に各メニューの"
-#~ "アクションが読み込まれる際にだけ行われるため、ここで変更した物を反映したと"
-#~ "しても、再起動しないと機能しなかったり、変更前の設定と衝突してしまうことが"
-#~ "あります。ここで変更を行った際には必ずJOSMを再起動するようにしてください。"
-#~ "</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>ショートカットキーを変更した場合、JOSMの<b>再起動</b>が必要となります。"
-#~ "再起動するまで変更しても反映されません。</p><br>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。"
-#~ "<br>タイムスタンプの情報が無いため、写真との同期はできません。</html>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。"
-#~ "<br>タイムスタンプの情報が無いため、音声データとの同期はできません。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-#~ msgstr ""
-#~ "サーバより、編集中の変更セットがクローズしたと通知されました。<br>おそら"
-#~ "く、変更セットのサイズが上限を超えています。<br>{0} 個のオブジェクトがサー"
-#~ "バにあります。\"{1}\"。"
-
-#~ msgid ""
-#~ "Can't restrict changeset query to the current user because the current "
-#~ "user is anonymous"
-#~ msgstr ""
-#~ "現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>HTTPプロキシ ''{0}'' の認証に失敗しました。有効なユーザー名とパス"
-#~ "ワードを入力してください。</html>"
-
-#~ msgid ""
-#~ "<html>Warning: depending on the authentication method the proxy server "
-#~ "uses the password may be transferred unencrypted.</html>"
-#~ msgstr ""
-#~ "<html>警告: プロキシサーバへのログイン用ユーザー名とパスワードは暗号化され"
-#~ "ずに送信される可能性があります。</html>"
-
-#~ msgid ""
-#~ "Warning: the JVM is not configured to lookup proxies from the system "
-#~ "settings. The property ''java.net.useSystemProxies'' was missing at "
-#~ "startup time. Won't use a proxy."
-#~ msgstr ""
-#~ "警告: JVM の環境がプロキシを使用しないよう設定されています。起動時"
-#~ "に''java.net.useSystemProxies'' が設定されていません。プロキシを利用せずに"
-#~ "接続します。"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "GPXを読み込むときにオーディオではないマーカーを作成"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "インストールされているプラグインは全て最新です。"
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>現在 JOSM は匿名ユーザで起動しています。<br>環境設定でOSMのユーザ名"
-#~ "を設定しないとあなたの変更セットをダウンロードすることはできません。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr "変更セットIDが無効な値です。1以上の整数を入力してください。"
-
-#~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
-#~ "and internal id {2}"
-#~ msgstr ""
-#~ "警告: 新しい外部ID{1}と内部ID{2} があるため、変更セットID {0} を無視しま"
-#~ "す。"
-
-#~ msgid "Errors during Download"
-#~ msgstr "ダウンロード中にエラーが発生しました"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "選択したプリミティブの履歴をダウンロードして表示"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>ベイカー ストリート</b> - 任意のキーや名前に 'ベイカー' と 'ストリー"
-#~ "ト' を両方含むもの"
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に 'ベイカー ストリート' "
-#~ "を含むもの。"
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - nameタグに 'Bak' を含むもの"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> -  キー 'type' の値が 'route' であるもの"
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> -  'type' というキーを持つもの全て。* は任意の文字列を意味し"
-#~ "ます。<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
-
-#~ msgid ""
-#~ "<html>The selected object isn''t available in the current<br>edit layer "
-#~ "''{0}''.</html>"
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer ''{0}''.</html>"
-#~ msgstr[0] ""
-#~ "<html>選択したオブジェクトは現在の編集レイヤー  ''{0}' 上にありません。</"
-#~ "html>"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "使用するスタイル (from {0})"
-
-#~ msgid "Play next marker."
-#~ msgstr "次のマーカーを再生"
-
-#~ msgid "Play previous marker."
-#~ msgstr "一つ前のマーカーを再生"
-
-#~ msgid "Jump back."
-#~ msgstr "一つ戻る"
-
-#~ msgid "Jump forward"
-#~ msgstr "一つ進む"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "変更セットID"
-
-#~ msgid "Current value ''{0}'' for user ID isn''t valid"
-#~ msgstr "ユーザID \"{0}\" は不正な値です。"
-
-#~ msgid ""
-#~ "Can't build changeset query with time based restrictions. Input isn't "
-#~ "valid."
-#~ msgstr ""
-#~ "入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できませ"
-#~ "ん。"
-
-#~ msgid ""
-#~ "Can''t restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "入力に誤りはありませんが、境界囲みに基づく変更セットクエリは生成できませ"
-#~ "ん。"
-
-#~ msgid ""
-#~ "The current value isn't a valid user ID. Please enter an integer value > 0"
-#~ msgstr "不正なユーザIDが入力されています。1以上の整数を入力してください。"
-
-#~ msgid ""
-#~ "<html>The  current value isn't a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr ""
-#~ "<html>不正なユーザ名です。<br>ユーザ名は空白以外を指定してください。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-#~ msgstr ""
-#~ "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していませ"
-#~ "ん。"
-
-#~ msgid ""
-#~ "<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-#~ "username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>OSM APIの認証 ''{0}'' に失敗しました。正しいユーザ名とパスワードを入"
-#~ "力してください。</html>"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -47690,583 +43590,53 @@
 #~ "てください。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
 
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "開く"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgid ""
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
+#~ msgstr "警告: タスクがキャンセルされたので例外を無視します。例外コード: {0}"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "常に問合せなしで更新する"
+
+#~ msgid ""
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "現在のデータレイヤ中の対応するプリミティブにズーム"
+#~ "<html> {0}このオブジェクトをアップロードするには、<strong>複数の変更セット"
+#~ "</strong>が必要です。どんな方法をとりますか？</html>"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr "OsmChangeのプロローグがまだ書かれていません。最初に書いてください。"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "選択中の転回制限用にエディタを開く"
 
 #~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-#~ msgstr "警告: 現在のJOSMユーザ用のユーザ情報の参照に失敗。例外コード: {0}"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "WMSレイヤーの位置を調整"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" は閉じられていないので連結できません。"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
+#~ msgstr ""
+#~ "GPXファイル ''{0}'' のパース中にエラー発生。ファイルの一部だけが利用可能と"
+#~ "思われます"
 
 #~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "<html>レイヤー ''{0}'' は、既にプリミティブ<br>''{1}''<br>で、競合していま"
-#~ "す。この競合は加えることができません。</html>"
+#~ "<html>一つのタイルを指定する場合は、<strong>タイルのアドレス</strong> での"
+#~ "指定も可能です。 <i>ズームレベル/x/y</i>で指定してください。例)"
+#~ "<i>15/256/223</i>。<i>zoom,x,y</i> or <i>zoom;x;y</i>での指定も可能です。"
+#~ "</html>"
+
+#~ msgid "Both"
+#~ msgstr "両方"
 
 #~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
+#~ "configurable because it is referenced by external applications talking to "
+#~ "JOSM."
 #~ msgstr ""
-#~ "警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除け"
-#~ "ません。"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>子リレーション<br>{0}<br>はサーバ上から削除されました。ロードできま"
-#~ "せん"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新し"
-#~ "いスキームを作成してください。明るい自然光の中で視認性を上げるには一致する"
-#~ "色の白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと "
-#~ "''Map Settings'' を参照してください(奇妙ですが本当です :-)"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイ"
-#~ "ポイントタグの ''name'', ''cmt'' または ''desc'' 属性が画像のファイル名と"
-#~ "一致したときに行われます。"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>ディレクトリを開けません。<br>ファイルを選択してください！</html>"
-
-#~ msgid ""
-#~ "Primitive {0} cannot be added to the relation because it was deleted."
-#~ msgstr "プリミティブ {0} は削除済のためリレーションに追加できません。"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "{0} プリミティブに空のロールを設定しています。"
-
-#~ msgid ""
-#~ "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>OSMサーバへのOAuthトークンの受け取りに成功しました。トークンを受け入"
-#~ "れる場合は <strong>{0}</strong>をクリックしてください。以後  JOSM がOSM "
-#~ "API にアクセスする際に使用します。</html>"
-
-#~ msgid "Node {0} cannot be added to the way because it was deleted"
-#~ msgstr "ノード {0} は削除済みなのでウェイに追加できません"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "これはこれらのプリミティブのロールを削除することと同じです"
-
-#~ msgid "GPS point"
-#~ msgstr "GPS ポイント"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "ファイル名または有効なスタイルのURLを追加"
-
-#~ msgid "Active styles"
-#~ msgstr "有効なスタイル"
-
-#~ msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-#~ msgstr "<html>ファイルを読み込めません。<br> エラー内容: <br>{0}</html>"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "警告: プリファレンス''{0}'' が見つかりません。"
-
-#~ msgid "Do not check and ask again at startup (remembers choice)"
-#~ msgstr "スタートアップ時にチェックと質問をしない(この選択を記憶)"
-
-#~ msgid ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-#~ msgstr ""
-#~ "警告: ダウンロード済みのプラグイン ''{0}'' のインストールに失敗。インス"
-#~ "トールをスキップしています。JOSMは古いプラグインバージョンをロードします。"
-
-#~ msgid "Download Object"
-#~ msgstr "オブジェクトをダウンロード"
-
-#~ msgid "Download Object..."
-#~ msgstr "オブジェクトをダウンロード..."
-
-#~ msgid "Exec"
-#~ msgstr "実行"
-
-#~ msgid "Execute Script"
-#~ msgstr "スクリプトを実行"
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "マルチポリゴンの内側のウェイが外にあります"
-
-#~ msgid "nice Plugin"
-#~ msgstr "素敵なプラグイン"
-
-#~ msgid ""
-#~ "Cannot open {0} file with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgstr[0] ""
-#~ "ファイルインポータ ''{1}'' で {0} ファイルをオープンできません。次のファイ"
-#~ "ルをスキップします:"
-
-#~ msgid "Use all my elements"
-#~ msgstr "全て自分の要素を使う"
-
-#~ msgid "Use all their elements"
-#~ msgstr "全て相手の要素を使う"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "削除されたプリミティブの併合に失敗"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html> <strong>{0}</strong> も <strong>{1}</strong> も有効にできません。"
-#~ "<br>ダウンロードしたOSMデータか、GPXデータか、その両方を閉じてください。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">ヘルプ項目の解説文がありません。</p><p "
-#~ "class=\"warning-body\">ヘルプ項目 <strong>{0}</strong>の解説文はまだ存在し"
-#~ "ていません。あなたの母国語 ({1})での解説も、英語の解説もないようです。"
-#~ "<br><br>不足している情報を追加して、JOSMのヘルプシステムを向上させてくださ"
-#~ "い。あなたの母国語({1})で<a href=\"{2}\">ヘルプ項目を編集する</a> こともで"
-#~ "きますし、  <a href=\"{3}\">英語のヘルプ項目を書くこともできます。</a></"
-#~ "p></html>"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "警告: \"\"{0}\"からのMappaintスタイルの解釈に失敗しました。発生した例外は"
-#~ "{1}:"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "現在のデータレイヤー中のこの変更セットのコンテンツ内のプリミティブにズーム"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "ID {0} のオブジェクトの結合対象が見つかりません"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "ソースオブジェクトが古いバージョン{2}が不可視であっても、対象となるid {0}"
-#~ "でバージョン{1}のオブジェクトは可視になります。この一貫性の矛盾を扱うこと"
-#~ "はできません。対象オブジェクトを維持します。 "
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM２０北測地システム"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "以下のプリミティブは、対象となるプリミティブにコピーできません。<br>これは"
-#~ "先方のデータセットが削除されているためです:"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>プラグイン {0} をロードできません。プラグインの<br>main クラス "
-#~ "''{1}'' が見つかりません。<br>プリファレンスから削除しますか？"
-
-#~ msgid "Splits the way"
-#~ msgstr "ウェイを分割"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "代わりにOSMウェイが必要です。"
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "基本エディタに移動してOSMウェイを手動で選んでください。"
-
-#~ msgid "Image not created properly."
-#~ msgstr "画像は正しく作成されませんでした。"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "クリップボードから'経由地'オブジェクトを挿入"
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "基本エディタに変更し、OSMウェイを選択"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "摂氏"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} 件の競合が未解決です。<br><br>競合リストダイアログをオープンして手動で"
-#~ "解決してください。"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "あなたのOSMユーザ名とパスワードを入力してください。パスワードはJOSMのプリ"
-#~ "ファレンスに平文で保存され<strong>ません</strong>。OSMサーバへは<strong>一"
-#~ "回だけ</strong>送信されます。以降のデータアップロードリクエストはそれ以上"
-#~ "あなたのパスワードを使用しません。"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "{0} 個のプリミティブまで"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "{0} 個のプリミティブの削除を取消す"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "選択したプリミティブを他のレイヤーに結合"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "クリックして選択している範囲をダウンロード"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "コピーしたデータは不完全なプリミティブを含んでいます。貼り付けると不完全な"
-#~ "プリミティブが削除されます。データを不完全なプリミティブ抜きで貼り付けます"
-#~ "か？"
-
-#~ msgid "Set width of building"
-#~ msgstr "ビルの幅をセット"
-
-#~ msgid ""
-#~ "The turnrestrictions plugin allows to create and edit turn restrictions "
-#~ "in the OpenStreetMap database."
-#~ msgstr ""
-#~ "turnrestrictions プラグインを使ってOpenStreetMapデータベースに転回制限を作"
-#~ "成、編集することができます。"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>あなたのローカルバージョンを保持するために、JOSM<br>はプリミティブ "
-#~ "{0} のIDを0にリセットしなければなりません。<br>次回アップロード時にサーバ"
-#~ "はこれに新しいIDを<br>割り当てます。<br>同意しますか？</html>"
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>警告:</strong>パスワードは<strong>平文で</strong>OSM webサイトに転"
-#~ "送されます。OSMサーバが暗号化した通信方式(HTTPS)を使うまで、重要なパスワー"
-#~ "ドは決して<strong>使わないでください</strong>。"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除され"
-#~ "ています。<br><br>このノードも削除を取り消しますか？"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上"
-#~ "から削除されています。<br><br>これも削除を取り消しますか？"
-
-#~ msgid "Grab buildings"
-#~ msgstr "ビルをつかむ"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "較正データをファイルにロードします"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "不正なIDが指定されました。オブジェクトをダウンロードできません。"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "建物の反対側の終端をポイント"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "描画を始める建物の角度をポイント"
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "不完全なオブジェクトを削除しようとしています。<br>実際のオブジェクトを見て"
-#~ "いないので問題を引き起こす可能性があります。<br>本当に削除しますか？"
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "接続されたセグメントはアラインできません。\n"
-#~ "ノードを共有していない２つのセグメントを選択してください。"
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "ロール''from''のOSMウェイを追加"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "ロール''to''のOSMウェイを追加"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "方向転換の中ではロール<tt>to</tt>のOSMウェイが必須です。"
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr "方向転換の中ではロール<tt>from</tt>のOSMウェイが必須です。"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "破損したタグ付けプリセット \"{0}-{1}\" - display_values中のアイテム数は値"
-#~ "の中にあるものと同じでなければなりません"
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "建物のコーナーをポイントして描画を開始"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "アラインするとノードを世界の外におくことになります。\n"
-#~ "あなたの操作を元に戻しています。"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "クリックして建物を抽出(ベクター画像のみ)"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "子スクリプトが不正なデータを返した"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "自動保存されたosmデータを読み込めません ({0}) - {1}"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "トラックウェイポイントのラベル付け変更を許可"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "アドレスにはリレーションを使わないでください (エレメントには \"addr:street"
-#~ "\" を使用)。"
-
-#~ msgid "read protocol version"
-#~ msgstr "プロトコルバージョンを読み込む"
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Seamarkエディタ"
-
-#~ msgid "Edit SeaMap Symbols"
-#~ msgstr "SeaMapシンボルを編集"
-
-#~ msgid "jump"
-#~ msgstr "ジャンプ"
-
-#~ msgid "play/pause"
-#~ msgstr "再生/停止"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "GPSのタイムコードを入力してください"
-
-#~ msgid "forward"
-#~ msgstr "進む"
-
-#~ msgid "backward"
-#~ msgstr "戻る"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr "前回JOSMが異常終了したように見えます。データをリストアしますか?"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "ランドサット(ミラー)"
-
-#~ msgid "Internal style"
-#~ msgstr "内部スタイル"
-
-#~ msgid "Add relation"
-#~ msgstr "リレーションの追加"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "難易度の高い山岳登山道"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "専門家向け山岳登山道"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "山間地のハイキング"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "登山道"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "難度の高い登山道"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "1つのオブジェクトのプロパティを変更"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "名前のないWMSレイヤ"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "WMS URLの追加"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Wikiのヘルプをブラウザで開いてオブジェクトを選択"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "ID{1}を持つオブジェクトタイプ{0}に削除の印が付けられましたが、元のデータ"
-#~ "セットにありません"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "{0}のプラグインで置換"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "リモート制御を初期化できません。"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "リモート制御を許可(remotecontrolプラグインが必要)"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "Remote WMS"
-#~ msgstr "リモートWMS"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr "オフセットを詳細に記録するにはズームレベルが不十分です"
-
-#~ msgid "Re-open bug"
-#~ msgstr "バグを再オープン"
-
-#~ msgid "Close bug"
-#~ msgstr "バグをクローズ"
-
-#~ msgid "Add comment"
-#~ msgstr "コメントを追加"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "現在の投影法は{0}にセットされています"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "投影法を{0} から {1}にセット"
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "Remote control プラグインは {0}とは非互換です。"
-
-#~ msgid "Add offset bookmark"
-#~ msgstr "オフセットブックマークを追加"
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: リモートコントロールに問題発生"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0}は有効になりますが、リモートコントロールは無効化されました。\n"
-#~ "プラグインを更新してください。"
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "\"{1}\"の現在のバージョン: {2}, 内部バージョン {3}。必要なバージョン {4}, "
-#~ "内部バージョン {5}。\n"
-#~ "プラグインを更新しても変わらないようなら\"{0}\"にバグをレポートしてくださ"
-#~ "い。"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "少なくともマージする２つのノード、または別のノードに近接しているノードを選"
-#~ "んでください。"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "次回からはキー入力を求めない"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "GPSトラック中 {0} {1}%"
-
-#~ msgid "remove entry"
-#~ msgstr "エントリを削除する"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "URLを入力して新しいWMS/TMSエントリを追加する"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "以下は自動検証の結果です。注意深くそれらを修正することを試みてください(有"
-#~ "効なデータを消さないように)。それらについて疑問がある場合は無視してくださ"
-#~ "い。<BR>このダイアログをキャンセルすると、検証サイドパネルでエントリを探す"
-#~ "ことができます。"
+#~ "JOSMは常にlocalhostの8111番ポートをlistenします。 このポート番号は、外部ア"
+#~ "プリケーションがJOSMと連携するために使うので変更できません。"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "疑わしいデータが見つかりましたがアップロードしますか？"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 26529)
+++ applications/editors/josm/i18n/po/nb.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-19 17:53+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:41+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:39+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Overser feilutformet fil-URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" støtter ikke filnavn eller fil baner"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Overser feilutformet URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -135,13 +136,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -161,7 +162,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -171,6 +172,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -201,5 +202,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -381,6 +382,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -407,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -413,7 +414,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -421,5 +423,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -630,5 +632,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -878,5 +880,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -885,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1064,6 +1066,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1214,5 +1216,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1430,6 +1432,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2069,5 +2071,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2375,7 +2377,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Last ned data"
@@ -2626,5 +2628,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2750,10 +2752,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2916,5 +2918,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3483,5 +3485,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3532,40 +3534,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Fjern «{0}» for linje «{1}»"
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#, java-format
+msgid "Set {0}={1} for node ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Sett {0}={1} for linje «{2}»"
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3690,4 +3692,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3986,6 +3989,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4022,5 +4025,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4124,5 +4127,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4224,5 +4227,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4241,8 +4244,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4382,50 +4385,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-sone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4450,80 +4467,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Sveits)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4743,45 +4780,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Ingen ytre linje i multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5052,5 +5089,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5075,5 +5112,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5084,5 +5121,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5490,5 +5527,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5554,5 +5591,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "ferdselsvei"
@@ -5560,5 +5597,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5566,10 +5603,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vannvei"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "bruk av grunn"
@@ -5579,5 +5616,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5591,5 +5628,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5602,5 +5639,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5958,5 +5995,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6065,4 +6102,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6162,5 +6200,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6203,5 +6241,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6492,9 +6530,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Liste over sammenslåtte elementer. De vil erstatte lokale elementer når "
-"sammenslåingsvalgene tas i bruk."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6743,10 +6779,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Behold lokale koordinater"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Behold tjenerens koordinater"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6802,6 +6838,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6823,6 +6859,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7209,5 +7245,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7444,5 +7480,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7656,7 +7692,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "ukjent"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7920,5 +7986,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7938,5 +8004,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7953,5 +8019,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7959,5 +8025,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -8000,5 +8066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8006,5 +8072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8196,5 +8262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8294,5 +8360,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Bruker"
@@ -9286,5 +9351,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9466,5 +9531,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9607,4 +9672,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9616,4 +9682,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9876,9 +9948,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9887,13 +9959,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9906,18 +9978,19 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Endre verdier?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9926,5 +9999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9934,5 +10007,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9941,27 +10014,31 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Velg de objekter, du vil rette egenskaper for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9970,62 +10047,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10089,9 +10166,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10113,5 +10192,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10441,9 +10520,4 @@
 msgstr "Det oppstod {0} konflikter under import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10483,10 +10557,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10763,37 +10831,4 @@
 msgstr "Type"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "ukjent"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10909,20 +10944,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historikk for linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -11018,5 +11053,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11563,8 +11598,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11966,4 +12001,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11989,11 +12025,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12070,38 +12099,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Tilpass farge"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Standard"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Velg en farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12112,9 +12141,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12122,26 +12151,26 @@
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12150,8 +12179,8 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12160,12 +12189,12 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12174,10 +12203,10 @@
 msgstr[1] "{0} spor, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12185,78 +12214,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12267,11 +12296,11 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12281,6 +12310,6 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12290,27 +12319,27 @@
 "utelatt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Markører fra navngitte punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne sporpunkt fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importer lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12320,29 +12349,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importer bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12446,5 +12475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12454,57 +12483,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Last Kartbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Hent alle kartbilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Zoom inn"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Zoom ut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Tøm bildehurtiglager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13041,10 +13078,10 @@
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "GPS-flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13052,5 +13089,5 @@
 msgstr[1] "flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13059,26 +13096,26 @@
 msgstr[1] "{0} består av {1} flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Slå av/på visning av tekst/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synkroniser lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Du må sætte lyden på pause når du hører synkroniserings-merket."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13086,14 +13123,14 @@
 msgstr "Lyd synkronisert i punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan ikke synkronisere i det avspillte lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Sett audio-merke ved avspilnings-start"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13121,13 +13158,13 @@
 msgstr "Kan ikke sette ny audio-markør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Der opstod en feil i forsøket på å vise URL’en for denne markøren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL var: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Feil ved visning av URL"
@@ -14075,82 +14112,82 @@
 msgstr "Farger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Bare ved enden av linja."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle noder i utvalg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i annen farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14158,15 +14195,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automatisk"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Navn"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Beskrivelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Ingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Bruk globale innstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14177,47 +14250,39 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Ingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Tegn linjer selv om ingen segmenter ble importert."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkt."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -14225,5 +14290,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14247,5 +14312,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14288,5 +14353,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14300,38 +14365,18 @@
 msgstr "Til fots"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig opptegning (ser uryddig ut)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automatisk"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Navn"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Beskrivelse"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Begge"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14340,10 +14385,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14353,10 +14398,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14365,10 +14410,10 @@
 "alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14376,10 +14421,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14387,5 +14432,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14393,14 +14438,14 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14410,13 +14455,13 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14424,27 +14469,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter gjennomsnittsfarten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15104,5 +15167,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15194,5 +15257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reset"
@@ -15471,6 +15534,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Oppdater alltid uten å spørre"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -15855,5 +15918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15882,9 +15945,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16164,6 +16227,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16486,5 +16549,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16705,5 +16768,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17093,4 +17156,9 @@
 msgstr "Lagre bruker og passord (ukryptert)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17889,4 +17957,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18006,4 +18076,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18578,5 +18662,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34895,4 +34979,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34909,6 +34994,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34927,15 +35012,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "forkortet gatenavn"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "enveiskjøring-egenskap på node"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "Node har egenskap bro"
@@ -34946,12 +35031,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "feil ferdselsvei-egenskap på node"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Uklassifisert ferdselsvei uten navn"
@@ -34960,16 +35045,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "ferdselsvei uten veinummer"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "midlertidig ferdselsveitype"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "feilstavet nøkkelnavn"
@@ -34979,10 +35064,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "sykkelvei med egenskapen sykkel"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "gangvei med egenskapen fotgjenger"
@@ -34991,10 +35076,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "separat sykkelvei som kjørefelt på en sykkelvei"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "hinder brukt på en vei"
@@ -35003,35 +35088,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "fartsgrense er brukt på gangvei"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "navn på lag inneholder +-tegn"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "gatenavn inneholder ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relasjon uten angitt type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurant uten navn"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "uvanlig kombinasjon av egenskaper"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35136,117 +35230,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Tsjekkisk CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Tsjekkisk UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-kart"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kart (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi, Italia"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilia, Italia"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35493,6 +35597,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Opplastingen ble avsluttet"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35594,9 +35698,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35614,23 +35718,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35638,26 +35772,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informasjon"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35665,5 +35827,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35774,9 +35936,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35875,17 +36037,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36516,32 +36695,35 @@
 msgstr "Velg kommune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Programtillegget cadastre-fr har tidligere brukt hurtigtasten F11 for å "
-"laste ned bilder.\n"
-"Denne tasten brukes nå for å endre fullskjermmodus som forvalg.\n"
-"Vil du gjenopprette bruken av F11 til å laste ned bilder?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Gjenopprett F11-hurtigtast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36666,8 +36848,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37563,5 +37744,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37571,17 +37752,17 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter i dette laget."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkt i dette laget."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Velg linjetegnings-innstillinger"
@@ -37733,5 +37914,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37739,10 +37920,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37751,5 +37932,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37758,6 +37939,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37766,9 +37947,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37927,71 +38108,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37999,32 +38188,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38059,6 +38242,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38189,30 +38372,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38908,5 +39104,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38923,5 +39119,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39659,17 +39855,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39683,36 +39879,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40334,5 +40526,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41304,4 +41496,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41521,6 +41730,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41769,5 +41978,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42338,5 +42547,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42722,3198 +42931,54 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Flytt"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Lagre og avslutt"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Ulagrede endringer"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Angi koordinatene for den nye noden."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Noen av nodene er (nesten) på linje"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Legg inn verdier for alle konflikter."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Valgte noder er ikke i en sirkel."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Kartprojeksjonen ikke funnet i oppsettet. Benytter EPSG:4326"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sammenføy uansett"
-
-#~ msgid "gps track description"
-#~ msgstr "beskrivelse av sporloggen"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM hjelpesider"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Feil ved nedlasting av {0}"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A>."
+#~ msgid "unusual tag combination"
+#~ msgstr "uvanlig kombinasjon av egenskaper"
+
+#~ msgid "Change values?"
+#~ msgstr "Endre verdier?"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Opplastingen ble avsluttet"
 
 #~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">english</A> ellerr <A HREF="
-#~ "\"{1}\">norsk bokmål</A>."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Velg minst to noder til å samle"
+#~ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for "
+#~ "JOSM."
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Behold tjenerens koordinater"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Behold lokale koordinater"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "De valgte nodene er medlemmer i forskjellige relasjoner. Vil du fremdeles "
-#~ "samle noder?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Samle noder med forskjellige relasjoner?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Samle noder allikevel"
-
-#~ msgid "Create a new map."
-#~ msgstr "Lag et nytt kart."
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Ukjent koding: "
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Ugyldig koding: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Feil i kontrollsum: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Koodinater med null: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Feil ved import av NMEA data!"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Bare to noder tillatt"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Åpne side med globale innstillinger."
+#~ "Liste over sammenslåtte elementer. De vil erstatte lokale elementer når "
+#~ "sammenslåingsvalgene tas i bruk."
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Feilmelding: cannot check conditions for no layer. Send inn en "
-#~ "feilmelding."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ingen åpne dokument å lagre"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Ukjent filtype."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Det oppsto feil under gjenoppretting fra sikkerhetskopi."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Det oppsto feil under lagring."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Kan ikke ta sikkerhetskopi."
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "Yahoo (GNOME)"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Kopier {0} noder til {1} noder"
+#~ "Programtillegget cadastre-fr har tidligere brukt hurtigtasten F11 for å "
+#~ "laste ned bilder.\n"
+#~ "Denne tasten brukes nå for å endre fullskjermmodus som forvalg.\n"
+#~ "Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ingen data å oppdatere. Har du allerede åpnet eller lastet dette ned?"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
 
 #~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "Dette vil kreve {0} runder med download requests. Fortsette?"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Laste opp disse endringene?"
-
-#~ msgid "Uploading data"
-#~ msgstr "Laster opp data"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Data inneholder uløste konflikter som først må løses."
-
-#~ msgid "Play next marker."
-#~ msgstr "Spill fra neste merke"
-
-#~ msgid "Next Marker"
-#~ msgstr "Neste merke"
-
-#~ msgid "Jump forward"
-#~ msgstr "Neste spor"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Rask Avspilling"
-
-#~ msgid "Jump back."
-#~ msgstr "Hopp tilbake."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Forrige merke"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Spill av forrige merke"
-
-#~ msgid "No data imported."
-#~ msgstr "Ingenting er importert."
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Følgende feil oppsto under nedlasting:"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Velg, flytt og roter objekt"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Objekt flyttes ved å trekke med musepeker; Shift legger objekt til i "
-#~ "utvalget (Ctrl slår av/på);\r\n"
-#~ "Shift-Ctrl for å rotere utvalget; eller endre utvalg"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Load Selection"
-#~ msgstr "Les inn utvalg"
-
-#~ msgid "Change"
-#~ msgstr "Endre"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "OR mangler argument."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Forventer parentes slutt."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "NOT mangler argument."
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Sett {0}={1} i {2} {3}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "{0} konflikter må løses i {1} objecter"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Slett {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Slett {1} {0}"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relasjonen har konflikter"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Fjern medlem i relasjon"
-
-#~ msgid "Rotate"
-#~ msgstr "Roter"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Ikke bruk endringer"
-
-#~ msgid "different"
-#~ msgstr "forskjellig"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "V"
-
-#~ msgid "E"
-#~ msgstr "Ø"
-
-#~ msgid "position"
-#~ msgstr "posisjon"
-
-#~ msgid "false"
-#~ msgstr "usann"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Feil: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Advarsel: {0}"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326 (lengde- og breddegrad)"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Kan ikke lagre bokmerke."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Kan ikke lese bokmerke."
-
-#~ msgid "their version:"
-#~ msgstr "annen versjon:"
-
-#~ msgid "resolved version:"
-#~ msgstr "rett versjon"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} object har konflikter:"
-#~ msgstr[1] "{0} object har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min versjon:"
-
-#~ msgid "Set the language."
-#~ msgstr "Velg språk"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Åpne fil (som rå gps, dersom .gpx)"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Gjør opplastede programtillegg tilgjengelig"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "I stedet for  --download=<bbox> kan du bruke osm://<bbox>\n"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Slå av/på fullskjerm"
-
-#~ msgid "Full Screen"
-#~ msgstr "Fullskjerm"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Konflikter ved sammenføyning."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Kommandoliste: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Løs Konflikt"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Løs Konflikter"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Oppfrisk liste - Klikk Reload"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Tilbakestill status på alle valgte objekt til versjon som valgt i "
-#~ "historikk."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikter: {0}"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ikke implementert enda."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Vis/skjul tekst/ikoner"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Noen endringer er ikke lagret. Slett allikevel?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Vil du virkelig slette hele laget?"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Slett valgt Lag."
-
-#~ msgid "Delete Layer"
-#~ msgstr "Slett Lag"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Nøkkelen blir ikke lagret når den er tom."
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Sammenføy laget under med dette."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lag: {0}"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Endre relasjon {0}"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Endre ny relasjon"
-
-#~ msgid "Create new relation"
-#~ msgstr "Oprett ny relasjon"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Endre Oppsett"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Egenskaper (tom verdi fjerner egenskap)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Brukt av"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Fjern alle valgte objekt fra relasjon"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Fjern Utvalg"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Tilføy alle valgte objekt som medlemmer"
-
-#~ msgid "Add Selected"
-#~ msgstr "Legg til utvalgte"
-
-#~ msgid "Move Up"
-#~ msgstr "Flytt opp"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Det var konflikter ved import."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Medlemmer: {0}"
-
-#~ msgid "Move Down"
-#~ msgstr "Flytt ned"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relasjons-editor: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Oppfrisk utvalgslisten"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Opphavsmenn: {0}"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Vis Opphavsmenn Panel"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Tast inn et navn for stedet."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Tast inn først de ønskede koordinater."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Velg først et bokmerke"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Datakilder og typer"
-
-#~ msgid "Download Area"
-#~ msgstr "Last ned område"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Skriv inn en søkestreng"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "nær"
-
-#~ msgid "x from"
-#~ msgstr "x fra"
-
-#~ msgid "zoom level"
-#~ msgstr "Zoom-nivå"
-
-#~ msgid "name"
-#~ msgstr "navn"
-
-#~ msgid "to"
-#~ msgstr "Til"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og "
-#~ "flytt musa. Velg: Klik"
-
-#~ msgid "y from"
-#~ msgstr "y fra"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Du kan bruke mus eller Ctrl+piltaster/./ for å zoome og panorere."
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ingen bilder med lesbare tidsstempler funnet"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Ingen tid gitt for punkt {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Bilder for {0}"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS start: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "nåværende forskjell: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS-slutt: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "bilde"
-#~ msgstr[1] "bilder"
-
-#~ msgid "timezone difference: "
-#~ msgstr "tidssone-forskjell: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} innenfor sporet."
-
-#~ msgid "Sync clock"
-#~ msgstr "Synkronisér klokke"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-enhetens tidssone (forskjell fra foto)"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synkronisér tidspunkt med GPS-enhet"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Den indtastede tid kunne ikke tolkes"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#~ msgid "Length: "
-#~ msgstr "Lengde: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Tidshorisont: "
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "et GPS spor med {0} punkt"
-#~ msgstr[1] "et GPS spor med {0} punkt"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punkt"
-#~ msgstr[1] "punkt"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} består av {1} GPS spor"
-#~ msgstr[1] "{0} består av {1} GPS spor"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} slettet.)"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punkt"
-#~ msgstr[1] "{0} punkt"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Opprett markører uten lyd når GPX-data leses."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Maksimal lengde (i meter) for å tegne linjer. Sett til '-1' for å tegne "
-#~ "alle linjer."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Punkt og track linjer får farge etter dilution of position (HDOP). Dersom "
-#~ "GPS kan logge dette."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
-
-#~ msgid "Download List"
-#~ msgstr "Last ned liste"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Tilføy enten site-josm.xml eller Wiki-sider."
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxy Innstillinger"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonym"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre "
-#~ "noen passord."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM passord"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM brukernavn (e-postadressen)"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i "
-#~ "konfigurasjons filen.<br>Passordet er overført i vanlig tekst til "
-#~ "serveren, satt inn i web adressen.<br><b>Ikke bruk et viktig passord da "
-#~ "andre kan lese det.</b></html>"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Takk for din forståelse</p>"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Feil passord eller brukernavn."
-
-#~ msgid "Unknown version"
-#~ msgstr "Ukjent versjon"
-
-#~ msgid "Enter Password"
-#~ msgstr "Skriv inn passord"
-
-#~ msgid "Login"
-#~ msgstr "Logg inn"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Overføring avbrutt på grunn av feil (vil vente i 5 sekunder):"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versjon {1} {2}"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Slett og last ned"
-
-#~ msgid "Do not show again"
-#~ msgstr "Ikke vis igjen"
-
-#~ msgid "Public"
-#~ msgstr "Offentlig"
-
-#~ msgid "File could not be found."
-#~ msgstr "Filen finnes ikke."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Max lengde (i meter) for å tegne linjer i lokal fil. '-1' tegner alle "
-#~ "linjer."
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Benytt innebygd standardverdier"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Legg til ny Objektmal instilling i lista."
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Innstilling av Objektmaler"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>Den siste siden er en liste med kombinasjonstaster som JOSM automatisk "
-#~ "gir snarveier. For alle fire snarveitypene er det tre alternativer.. JOSM "
-#~ "benytter denne rekkefølgen dersom det er konflikter mellom snarveier. "
-#~ "Dersom alle alternativ allerede er brukt, vil JOSM automatisk velge en "
-#~ "for  deg.</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr "<p>Pseudo-kombinasjonstasten 'disabled' vil ta ut snarveien.</p>"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Dessuten: Første gang en menyknapp kobles til menyen blir hurtigtasten "
-#~ "aktivert. Derfor blir enkelte hurtigtaster aktive selv uten restart --- "
-#~ "men da også uten kontroll mot konflikter. Det anbefales derfor å bruke "
-#~ "<b>restart</b> uansett når endringer er utført.</p>"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Husk at hurtigtastene blir lest inn når JOSM starter opp. Derfor må du "
-#~ "ta en <b>restart</b> av JOSM for at endringer skal bli aktive.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Du vil finne ut at lista med hutigtaster inneholder taster fra alle "
-#~ "tastatur som Java kjenner, og ikke bare taster på ditt tastatur. Bruk "
-#~ "bare de tastene som faktisk eksisterer på ditt tastatur. Dersom ditt "
-#~ "tastatur ikke har en 'Copy' tast (PC tastatur har ikke disse, men de "
-#~ "finnes på tastatur fra Sun), bruk ikke dennet. Det vil også være taster "
-#~ "som stemmer med hurtigtaster på ditt tastatur (som f. eks. ':'/kolon). "
-#~ "Bruk ikke disse heller. Bruk hovedverdien for slike taster (';'/Semikolon "
-#~ "på US tastatur, '.'/Komma på Norsk tatstatur , ...) i stedet. Det skaper "
-#~ "konflikter dersom du ikke passer på dette. JOSM kan ikke vite om Ctrl"
-#~ "+Shift+; og Ctrl+: faktisk er den samme tasten på amerikanske eller "
-#~ "norske tastatur...</p>"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Finner ikke tallverdi i svaret"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, muligens fordi egenskaper mangler."
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Ingen base med rettinger tilstede for opplasting"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Versjon nummer mangler i OSM data"
-
-#~ msgid "Not initialized"
-#~ msgstr "Ikke startet"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har zero ref"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Opplasting av data feilet av ukjent grunn"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Ukjent versjon: {0}"
-
-#~ msgid "Error during parse."
-#~ msgstr "Feil ved innlesing."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du "
-#~ "prøver på nytt."
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3}gjenstår. laster {4}: {5} (id: {6})"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Ulovlig objekt med id=0"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Feil id for node"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fandt <member>-element i en ikke-relation."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Det var problem med følgende programtillegg:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Programtillegg oppdatert. Restart JOSM."
-#~ msgstr[1] "{0} Programtillegg oppdatert. Restart JOSM."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Programtillegget {0} kan være ødelagt eller kunne ikke lastes ned "
-#~ "automatisk."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Fant ikke programtillegget: {0}."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Opdater programtillegg"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "Programtillegget {1} er avhengig av programtillegg  {0} men ble ikke "
-#~ "funnet."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Programtillegget krever oppdatering {0} av JOSM."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Kunne ikke bruke oppdaterte programtillegg. Kontroller om JOSM tilgang "
-#~ "til å skrive over eksisterende."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
-#~ "i oppstettet 'pluginmanager.warntime'.)"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Programtillegget kunne ikke slettes. Vennligst meld ifra til JOSM "
-#~ "utviklerne."
-
-#~ msgid "No plugin information found."
-#~ msgstr "Fant ikke info om programtillegg."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Last ned programtillegg som mangler"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Last ned programtillegg?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Programtillegg finnes allerede"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alle installerte programtillegg er siste versjon."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Oppdater følgende programtillegg:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Last ned Programtillegg"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Venligst send en feilrapport på {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Beskriv hva du utførte og hvilke handlinger som ligger forut for "
-#~ "feilmeldingen.\r\n"
-#~ "Vær detaljert. Bruk engelsk."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Husk å inkludere følgende informasjon:"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "En uventet unntakstilstand opstod.\n"
-#~ "\n"
-#~ "Dette er altid en programmeringsfeil. Hvis du bruker siste\n"
-#~ "versjon av JOSM, setter vi pris på en feilrapport."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Programtillegg lista er allerede tilgengelig.  Vil du laste ned ny "
-#~ "versjon over den eksisterende?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Feil oppsto ved lesing av info om programtillegg: {0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Feil ved sletting av programtillegg: {0}"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Prøv å oppdatere til siste versjon av JOSM og alle programtillegg før du "
-#~ "sender feilrapport."
-
-#~ msgid "No username provided."
-#~ msgstr "Ingen Brukernavn er oppgitt."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Dette medfører at din sporlogg blir offentlig tilgjengelig på "
-#~ "openstreetmap.org"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Vis geotaggede bilder"
-
-#~ msgid "No password provided."
-#~ msgstr "Det er ikke oppgitt passord."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "En av de valgte filene var null (tom)!!!"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} hadde gps posisjon."
-
-#~ msgid "Open an other photo"
-#~ msgstr "Åpne et annet foto"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Jeg er i tidssonen: "
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Bilder uten egenskaper"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Bilder uden EXIF-posisjon"
-
-#~ msgid "Update position for: "
-#~ msgstr "Opdater posisjon for: "
-
-#~ msgid "All images"
-#~ msgstr "Alle bilder"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</"
-#~ "html>"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Valgte foto har ikke tidskode."
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-spor er lagt inn"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Foto har ikke tidskode."
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Fant {0} treff av {1} i GPX spor {2}"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Tidsforskjell på {0} dager)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Koplet {0} av {1} foto til GPX spor."
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Feil ved kobling av foto til GPX spor. Still inn rullefeltet for manuell "
-#~ "kobling."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert Zone 1 cache file (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert Zone 3 cache file (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert Zone 2 cache file (.2)"
-
-#~ msgid "Default Values"
-#~ msgstr "Standardverdier"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert Zone 4 cache file (.4)"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Bytt til kartprojeksjonen {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ugyldig kartprojeksjon"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "For å aktivisere Cadastre WMS plugin (Fransk matrikkel)\n"
-#~ "Bytt kartprojeksjon til Lambert og restart JOSM"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Velg Tableau d'Assemblage"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Fransk by/sted {0} ikke funnet eller tilgjengelig i WMS.\n"
-#~ "Sjekk om det finnes på www.cadastre.gouv.fr"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Et eget programtillegg for fransk Cadastre wms (matrikkel) på www."
-#~ "cadastre.gouv.fr<BR><BR>Du finner betingelser for bruk her (på fransk): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>før du laster inn data med "
-#~ "dette programtillegget."
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Automatisk egenskap: kilde er lagt inn:"
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Image grab multiplier:"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Last ned bilder fra fransk Cadastre WMS"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Hent bygningers avtrykk på bakken"
-
-#~ msgid "Zone"
-#~ msgstr "Sone"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "sett Lambert sone manuelt (f.eks. for posisjoner mellom to soner)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambert sone"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Først åpne lag (GPX, OSM, mellomlager)"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Legg til nytt lag"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Last ned  WMS kartutsnitt fra {0}"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Juster posisjon til WMS laget"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Posisjon på rutenettet"
-
-#~ msgid "Grid layout"
-#~ msgstr "Utseende på rutenettet"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rotasjon på rutenettet"
-
-#~ msgid "World"
-#~ msgstr "Verden"
-
-#~ msgid "Add grid"
-#~ msgstr "Legg inn rutenett"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Rutenett lag:"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Retningsindex '{0}' ble ikke funnet"
-
-#~ msgid "OpenLayers"
-#~ msgstr "Åpne lag"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Kunne ikke oprette ny feilrapport. Resultat: {0}"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Åpne vindu med OpenStreetBugs og aktiviser automatisk nedlasting"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambert sone {0} i mellomlager  stemmer ikke med aktiv Lambert sone {1}"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Raster midtpunkt: {0}"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender-indstillinger"
-
-#~ msgid "change the viewport"
-#~ msgstr "bytt arbeidsutsnitt"
-
-#~ msgid "load data from API"
-#~ msgstr "last inn data fra API"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "Bekreft alle Remote control handlinger manuelt"
-
-#~ msgid "change the selection"
-#~ msgstr "bytt utvalg"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Remote Control tilleggsprogrammet er satt til å lytte på port 8111 på "
-#~ "localhost.Porten kan ikke endres, da andre program skal benytte denne for "
-#~ "fjernstyring av tilleggsprogrammet."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Tillatte handlinger"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Remote Control tilleggsprogram innstillinger."
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Et programtillegg som tillater at JOSM blir styrt av et annet program"
-
-#~ msgid "autozoom"
-#~ msgstr "Automatisk zoom"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "Request Update"
-#~ msgstr "Be op Oppdatering"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Status på kartbilde"
-
-#~ msgid "image not loaded"
-#~ msgstr "Bilde er ikke lest inn"
-
-#~ msgid "Fade background: "
-#~ msgstr "Demp bakgrunn: "
-
-#~ msgid "requested: {0}"
-#~ msgstr "bestilt: {0}"
-
-#~ msgid "autoload tiles"
-#~ msgstr "Last kartbilder automatisk"
-
-#~ msgid "error loading metadata"
-#~ msgstr "feil ved lesing av informasjon om data"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Innstillinger for SlippyMap programtillegg."
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Autozoom: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Automatisk leste kartbilder: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max zoom niv: "
-
-#~ msgid "error requesting update"
-#~ msgstr "feil ved bestilling av oppdatering"
-
-#~ msgid "start"
-#~ msgstr "start"
-
-#~ msgid "end"
-#~ msgstr "avslutt"
-
-#~ msgid "<multiple>"
-#~ msgstr "<multiple>"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importer TCX fil som GPS spor"
-
-#~ msgid "Open User Page"
-#~ msgstr "Åpne brukerside"
-
-#~ msgid "Optional"
-#~ msgstr "Tillegg"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsett uansett"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Beklager. Anonyme brukere får ikke lov til dette."
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Bytt ut utvalg med brukers data"
-
-#~ msgid "Please select some data"
-#~ msgstr "Velg data først"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Åpne brukerside i utforsker"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Velg brukers data"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Velg en bruker fra panel med opphavsmenn"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "DETTE ER PÅ FORØKSTADIET. Lagre arbeidet og bekreft før opplasting."
-
-#~ msgid "Fix relations"
-#~ msgstr "Reparer relasjoner"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Slo sammen områder som overlappet seg selv"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Ingen skjæringspunkt funnet. Ingen endringer utført."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Bare to områder kan bli slått sammen foreløpig."
-
-#~ msgid "Grid"
-#~ msgstr "Rutenett"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Data med feil. Last opp uansett?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Korriger valgte feilmeldinger."
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Valider enten aktivt utvalg eller hele datasett."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorer valgte feilmeldinger neste gang."
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Denne testen undersøker om to veier, jernbaner eller vannveier krysser i "
-#~ "samme lag, uten å være knyttet i knutepunkt."
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Ulovlige kombinasjoner Egenskap / Verdi"
-
-#~ msgid "Painting problem"
-#~ msgstr "Problem med visning"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Sjekk etter feil ved opptegning."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Finn notater om tegning."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Noder uten egenskaper eller tilknytninger"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Hjelp WMS tilleggsprogram"
-
-#~ msgid "help"
-#~ msgstr "hjelp"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Tilpass posisjon på valgt  WMS lag"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Det oppsto en feil"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier bilde id"
-
-#~ msgid "Help / About"
-#~ msgstr "Hjelp / Om"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Du kan legge til, endre eller slette WMS kilder i WMSplugin Innstillinger "
-#~ "- disse vil vises i WMS menyen.\n"
-#~ "Kan også settes manuelt i Avanserte innstillinger, etter følgende mal:\n"
-#~ "wmsplugin.url.1.name=Landsat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE Maps... osv\n"
-#~ "\n"
-#~ "Full WMS URL input format eksempel (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/ , må "
-#~ "du bare oppgi gyldig 'id'.\n"
-#~ "Å legge inn  Metacarta Map Rectifier menyer, lag en URL manuelt som i "
-#~ "dette eksempelet. Bytt ut  73 med din bilde 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"
-#~ "OBS:  Sjekk at bildet er egnet med hensyn til kopibeskyttelse. Er du i "
-#~ "tvil: la være å bruke bildet."
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr ""
-#~ "Last ned Ortografisk korrekt bilde fra Metacarta's Map Rectifier WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Innstillinger WMS Programtillegg"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Gi meny navn og WMS URL"
-
-#~ msgid "Copy Default"
-#~ msgstr "Kopier Standard"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Velg raden du vil kopiere."
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (Standard)"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller "
-#~ "importerer bilder med koordinater i EXIF."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Programtilleggets hovedfunksjon er sletting av punkt i GPX sporfil. "
-#~ "Programtillegget kan brukes for klargjøring og redigering av GPC spor "
-#~ "(fjerne uinteressante punkt) før opplasting til OSM."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Bakgrunnslag som viser rutenettet i kartet"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Et programtillegg for å knytte bilder til Waypoint i en GPX fil. En "
-#~ "koblig opprettes når 'name', 'cmt' eller 'desc' egenskapen på et waypoint "
-#~ "stemmer med filenavnet til et bilde."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Tillater brukeren å lage flere fargepaletter og velge blant de. Endre "
-#~ "farger og lagre som ny palett. Benyttes for å bytte til hvit bakgrunn med "
-#~ "passende farger for bedre synbarhet i sollys. Se dialog i JOSM "
-#~ "innstillinger og Kart innstillinger (Rart men sant :-)"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Viser bakgrunnsbildet i et åpent lag"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "La andre program sende kommandoer til JOSM."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Viser rutene i slippy map i JOSM. Kan laste kartbilder fra slippy map som "
-#~ "bakgrunn og bestille oppdatering."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Last inn TCX filer direkte fra JOSM."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "En OSM data validator. Ser etter problem i data og kan fikse de mest "
-#~ "vanlige. Stavekontroll for egenskapsnavn."
-
-#~ msgid "Boat"
-#~ msgstr "Båt"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorbåt"
-
-#~ msgid "Goods"
-#~ msgstr "Varer"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ridevei"
-
-#~ msgid "Cycleway"
-#~ msgstr "Sykkelvei"
-
-#~ msgid "Footway"
-#~ msgstr "Gangvei"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Traktorvei klasse 3"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Traktorvei klasse 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Traktorvei klasse 2"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Traktorvei klasse 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Traktorvei klasse 4"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Fjellsti"
-
-#~ msgid "Station"
-#~ msgstr "Stasjon"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle linjene var tomme"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Du kan bare velge linjer."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Velg kun tre noder eller en linje med kun tre noder."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Vis historikk på OSM linjer eller noder."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling."
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Velg en eller flere lukkede linjer med minst fire noder."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Velg minst en node,linje eller relasjon. Bare opplastede element har "
-#~ "historikk.."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Ingen noder i denne linjen har andre knytninger."
-
-#~ msgid "Split way segment"
-#~ msgstr "Splitt linje i segment"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Linje for areal er ikke lukket."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Fant <nd> element i ikke_linje."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Opprett kopi av linje"
-
-#~ msgid "Closed Way"
-#~ msgstr "Lukket linje"
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Flere verktøy som kan gjøre livet enklere. Eksempel: forenkle linje, Slå "
-#~ "sammen areal, gå til posisjon."
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Dupliser linjer med parallell avstand"
-
-#~ msgid "Shop"
-#~ msgstr "Butikk"
-
-#~ msgid "Accomodation"
-#~ msgstr "Overnatting"
-
-#~ msgid "Map Type"
-#~ msgstr "Karttype"
-
-#~ msgid "citymap"
-#~ msgstr "bykart"
-
-#~ msgid "hikingmap"
-#~ msgstr "turkart"
-
-#~ msgid "map"
-#~ msgstr "kart"
-
-#~ msgid "bicyclemap"
-#~ msgstr "sykkelkart"
-
-#~ msgid "board"
-#~ msgstr "infotavle"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Veiviser (turvei)"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "football"
-#~ msgstr "football"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Antall ledere"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart."
-
-#~ msgid "linked"
-#~ msgstr "koblet"
-
-#~ msgid "More details"
-#~ msgstr "Flere detaljer"
-
-#~ msgid "% of lat:"
-#~ msgstr "% av bredden:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% av lengden:"
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Punkt i vann"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Kunne ikke lese projeksjon fra innstillinger. Bruker Mercators projeksjon."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Bruk desimalgrader."
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Løs konflikter"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Velg minst én oppgave å laste ned"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Åpne i nettleser"
-
-#~ msgid "History of Element"
-#~ msgstr "Historikk for elementet"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Du har valgt EPSG:4326-projeksjon som kan gi uønsket<br>resultat "
-#~ "ved vinkling til rette vinkler.<br>Bytt projeksjon for å unngå denne "
-#~ "advarselen.<br>Vil du fortsette?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Bare én node er valgt"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Medlemskap i en relasjon basert på en rolle er kopiert til alle nye "
-#~ "linjer.\n"
-#~ "Sjekk og korriger slik at dette er riktig."
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Et relasjonsmedlemskap  er kopiert til alle nye linjer.\n"
-#~ "Sjekk og korriger slik at dette er riktig."
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Oppdaterer aktuelt datalag fra tjeneren (laster ned på nytt)"
-
-#~ msgid "Update failed"
-#~ msgstr "Oppdatering feilet"
-
-#~ msgid "Update Data"
-#~ msgstr "Oppdater data"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Last opp til OSM …"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Last opp alle endringer til OSM-tjeneren."
-
-#~ msgid "Uploading"
-#~ msgstr "Laster opp"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Spill av sakte"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalag"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Feil under nedlasting"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Klikk for å slette. Shift: slett linjesegment. Alt: Ikke slett ubrukte "
-#~ "noder når linjer slettes. Ctrl: slett objekt med referanse."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Dra et linjesegment for å lage et rektangel."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Skriv inn søketekst."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller "
-#~ "intervall, for eksempel nodes:10-20"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Koble til {0} …"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Ugyldig verdi for id-operator: {0}. Verdien må være et tall."
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Feil ved tjenerkommunikasjon."
-
-#~ msgid "Downloading..."
-#~ msgstr "Laster ned …"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan "
-#~ "skape problemer fordi de kan være i bruk av andre objekter (som du ikke "
-#~ "kan se nå) .<br>Er du sikker på at du vil slette nodene?"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Feil i innstillingsfila. Lagrer sikkerhetskopi i {0}."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grader, minutter, sekunder"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Tomt medlem i relasjon."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Fant mer enn én \"via\"."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Fant ikke stil for restriksjon {0}."
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- aktive versjon er {0}"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert-sone (Frankrike)"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "VIKTIG: data ligger langt unna\n"
-#~ "grensene for den aktive Lambert-sonen.\n"
-#~ "Ikke last opp data etter denne beskjeden.\n"
-#~ "Angre siste handling, lagre arbeidet\n"
-#~ "og start et nytt lag i en annen sone."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametre leses i gitt rekkefølge, så last inn data før\n"
-#~ "du prøver --selection"
-
-#~ msgid "layer not in list."
-#~ msgstr "Laget er ikke i lista."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Kontakter OSM-tjeneren …"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Feil ved tolking"
-
-#~ msgid "File not found"
-#~ msgstr "Fant ikke fila"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Det er ulagrede endringer. Vil du forkaste endringene og fortsette?"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "ADVARSEL: Starter leservindu kun for de første {0} av {1} valgte objektene"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Gjeldende antall endringer overstiger maksimalt antall endringer: "
-#~ "gjeldende er {0}, maksimalt er {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Klarte ikke starte API. Prøv igjen senere."
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Verdiens lengde for egenskap «{0}» i objekt {1} overstiger maksimalt "
-#~ "tillatt lengde {2}. Verdiens lengde er {3}."
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Advarsel: forkorter automatisk verdi for egenskap «{0}» i slettet objekt "
-#~ "{1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "Klarte ikke starte API"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "multipolygon-linje «{0}» er ikke lukket."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Linje «{0}» med færre enn to punkter."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Fant mer enn én linje med «from»."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Fant ingen linje med «to»."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Fant mer enn én linje med «to»."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Fant ingen node eller linje med «via»."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Multipolygon-medlem «{0}» er ikke en linje."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Linje med «from» har ikke start eller slutt i en «via»-node."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Fant ingen linje med «from»."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Stil for indre linje «{0}» er samme som multipolygon."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Stil for ytre linje «{0}» passer ikke."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Ingen ytre linje for multipolygon «{0}»."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Skjæring mellom linjene «{0}» og «{1}»."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Indre linje «{0}» er utenfor."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Last ned alle ufullstendige linjer og noder i relasjonen"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Fordoble valgte linjer."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Fordoble linje"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Velg én enkel lukket linje med minst fire noder."
-
-#~ 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 ""
-#~ "De valgte linjene har noder utenfor nedlastet dataområde.\n"
-#~ "Dette kan medføre at noder blir slettet ved uhell.\n"
-#~ "Er du sikker på at du vil fortsette?"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Velg minst én lukket linje å sammenføye med."
-
-#~ 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] ""
-#~ "Utvalget har {0} linje. Er du sikker på at du vil forenkle denne?"
-#~ msgstr[1] ""
-#~ "Utvalget har {0} linjer. Er du sikker på at du vil forenkle disse?"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Rediger traktorvei klasse 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Rediger traktorvei klasse 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Rediger traktorvei klasse 3"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Rediger traktorvei klasse 5"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Rediger traktorvei klasse 4"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Det er ingen valgte objekter å oppdatere"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Fant ikke objekt med ID {0} i gjeldende datasett"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Mangler objekt"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Klarte ikke oppdatere valgte objekter."
-
-#~ msgid "Update Selection"
-#~ msgstr "Oppdater utvalg"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Oppdaterer de valgte objektene fra tjeneren"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Oppdaterer objekt"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synkroniser kun {0} {1}"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Konflikt oppdaget"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "Uventet returverdi. Mottok {0}."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Klarte ikke laste opp til OSM-API"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Slettede eller flyttede objekter"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Klarte ikke starte kommunikasjonen med OSM-tjener {0}.\n"
-#~ "Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker."
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Objekt allerede slettet"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Gjenopprett {0} objekter"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Advarsel: Rydder ut linje {0} fordi antall noder falt til under 2. "
-#~ "Nåværende er {1}."
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Rydder ut 1 objekt"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Løs {0} egenskapskonflikter i {1} {2}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Løs versjonskonflikter for {0} {1}"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "fjerner henvisning fra relasjon {0}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "fjerner henvisning fra vei {0}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Løs nodekonflikter i vei {0}"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "fant ikke {0} i liste"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nei, avbryt operasjonen"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, gjenopprett også dem"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Ytterligere {0} noder i bruk av linje {1},<br>er slettet på "
-#~ "tjeneren.<br><br>Vil du gjenopprette også disse nodene?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Gjenopprette ytterligere noder?"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Gjenopprette avhengige objekter?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Ytterligere {0} objekter med henvisninger i relasjon {1},<br>er "
-#~ "slettet på tjeneren.<br><br>Vil du gjenopprette også dem?</html>"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "ikke synlig (på tjeneren)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "synlig (på tjeneren)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Synlighetsstatus:"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Behold tjenerens synlighetsstatus"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Ja, rydd ut objektet"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Behold lokal synlighetsstatus"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Ja, nullstill ID"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Fjern fra datasett"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Laster historikk for {0} med ID {1}"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Historikk for {0} {1}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Vis historikken for det valgte objektet"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "E-postadresse for OSM-kontoen"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM-brukernavn (e-post)"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Versjon <strong>{0}</strong> lagt til <strong>{1}</strong> av "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API."
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
-
-#~ msgid "image loading..."
-#~ msgstr "laster bilde …"
-
-#~ msgid "Edit Station"
-#~ msgstr "Rediger stasjon"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Les GPX …"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Åpner endringssett …"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Sett opp nettsteder …"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Klargjør data …"
-
-#~ msgid "Preparing..."
-#~ msgstr "Forbereder …"
-
-#~ msgid "Uploading..."
-#~ msgstr "Laster opp …"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Åpne bilder med AgPifoJ …"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter …"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importer TCX-fil …"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Vis koordinatfestet bilde som bakgrunn i JOSM (WMS-tjenere, Yahoo, …)."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Tips: Noen endringer kom fra å laste opp nye data til tjeneren."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Klarte ikke lese tjenerrespons."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Klarte ikke koble til tjeneren."
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Klarte ikke kommunisere med tjener."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxy-tjenerens vert"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Bruk proxy-tjener"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxy-tjenerens port"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Den støtter protokollversjon 0.5 og 0.6, mens tjeneren støtter {0} til "
-#~ "{1}."
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL-adresse til tjener"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Brukernavn for proxy-tjener"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Passord for proxy-tjener"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "URL-adressen for OSM-tjeneren (REST API)"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Lastet ned informasjon om programtillegg fra {0} tjener"
-#~ msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Rediger liste over WMS-tjenere som vises i WMS-programtillegg"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Behold sikkerhetskopier"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Kilder for objektmaler"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Kilden (URL eller filnavn) på definisjonsfiler for objektmaler. Se http://"
-#~ "josm.openstreetmap.de/wiki/TaggingPresets for hjelp."
-
-#~ msgid "Tile Sources"
-#~ msgstr "Kilder for kartbilder"
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
-#~ "bruker, åpner brukerprofil i nettleser."
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Rediger krevende fjellsti"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Rediger tursti"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Rediger fjellsti"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Rediger krevende alpin fjellsti"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Rediger vanskelig alpin fjellsti"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Rediger alpin fjellsti"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Krevende fjellsti"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Vanskelig alpin fjellsti"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Krevende alpin fjellsti"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Alpin fjellsti"
-
-#~ msgid "park_and_ride"
-#~ msgstr "Innfartsparkering"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Rediger flyplass"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Rediger turistinformasjon"
-
-#~ msgid "Board Type"
-#~ msgstr "Tavletype"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motorsport"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Rediger motorsport"
-
-#~ msgid "Edit Football"
-#~ msgstr "Rediger amerikansk fotball"
-
-#~ msgid "Football"
-#~ msgstr "Amerikansk fotball"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Rediger rugby"
-
-#~ msgid "Amenities"
-#~ msgstr "Fasiliteter"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "Yahoo (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "Yahoo (GNOME-fiks)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "Yahoo (WebKit GTK)"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Bruk <b>\"</b> for å søke etter operatortegn (f.eks. hvis nøkkel "
-#~ "inneholder «:»)"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Feil antall parametere for nodes-operator."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Klarte ikke gi nytt navn til fila «{0}»."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Klarte ikke lese fra URL: «{0}»"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Kartprojeksjonen «{0}» er kun laget for\n"
-#~ "nordlige grader mellom 46.1° og 57°.\n"
-#~ "Velg annen kartprojeksjon når du ikke bruker\n"
-#~ "en fransk WMS-tjener.\n"
-#~ "Ikke last opp data etter denne beskjeden."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Fjern «{0}» i {1} {2}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Utvalg «{0}» brukes av relasjon «{1}» med rolle {2}.\n"
-#~ "Vil du slette utvalget fra relasjonen?"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Fjern «{0}» i {1} «{2}»"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Kartprojeksjonen «{0}» er bare beregnet på\n"
-#~ "breddegrader mellom 45.7° og 47.9°\n"
-#~ "og lengdegrader mellom 5.7° og 10.6°.\n"
-#~ "Benytt en annen kartprojeksjon når du jobber\n"
-#~ "andre steder enn Sveits eller  Lichtenstein.\n"
-#~ "Ikke last opp data etter  denne meldingen."
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Klarte ikke tolke datoen i fila «{0}»."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Utvalg «{0}» brukes av relasjon «{1}».\n"
-#~ "Vil du slette utvalget fra relasjonen?"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Feil i URL: «{0}»"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Mangler obligatorisk attributt «{0}»."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Ukjent rolle «{0}»."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Slettet medlem «{0}» i relasjon."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Ukjent medlemstype for «{0}»."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Objektmalgruppe «{0}»"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Sett {0}={1} i {2} «{3}»"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Nan</b> – «Nan» finnes innen navnet."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> – nøkkel «type» med eksakt verdi «route»."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> -– nøkkel «type» med hvilken som helst verdi. Prøv også "
-#~ "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Nan</b> – «Nan» finnes ikke innen navnet."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Advarsel – programtillegget {0} skulle lastes inn, men det er ikke lenger "
-#~ "behov for det."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>… – objekt med angitt ID"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>… – objekt med angitt antall noder"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ – Geotaggede  bilder"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simulerer et klikk når du gjør korte og små musedrag. Dette er beregnet "
-#~ "på tablets og trykkfølsom skjerm hvor det er problemer å klikke med musa "
-#~ "samtidig som du drar (generelt tablet-problem i java)."
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Dupliser hurtigtast for knappen «{0}» – knappen blir ignorert."
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Kan ikke fordoble usortert linje."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
-#~ "HREF=\"{1}\">norsk (bokmål)</A>."
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "parameter {0} > 0 nødvendig. Leste {1}."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Det er {0} elementer i det lokale datasettet som<br>kan være "
-#~ "slettet på tjeneren. Hvis du senere prøver å slette<br>eller oppdatere "
-#~ "dem, vil tjeneren sannsynligvis rapportere om en<br>konflikt."
-#~ "<br><br>Trykk <strong>{1}</strong> for å sjekke status for disse "
-#~ "elementene<br>på tjeneren.<br>Trykk <strong>{2}</strong> for å ignorere."
-#~ "<br></html>"
-
-#~ msgid "changeset"
-#~ msgstr "endringssett"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "kan ikke løse uavgjort konflikt"
-
-#~ msgid "changesets"
-#~ msgstr "endringssett"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Følgende feil oppstod under massenedlasting:"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Opplasting <strong>feilet</strong> fordi et element du prøvde "
-#~ "å<br>slette allerede er slettet på tjeneren.<br><br>Feilmelding:<br>{0}</"
-#~ "html>"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parameter «{0}» må ha en verdi"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "Fant ingen siste versjon. Historikken er tom."
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Denne historikken har ikke noe element med versjon {0}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "Fant ingen første versjon. Historikken er tom."
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Egenskaper ({0} konflikter)"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} gjenværende egenskapskonflikter å løse"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Lokalt element med ID {0} og versjon {1} er synlig selv om tjenerens "
-#~ "element med lavere versjon {2} ikke er synlig. Kan ikke håndtere denne "
-#~ "selvmotsigelsen. Beholder lokalt element. "
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "Uventet verdi for parameter «index». Leste {0}."
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopier valgte lokale elementer til slutten av lista over sammenslåtte "
-#~ "elementer"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Kopier valgte lokale elementer til plassen før første valgte element i "
-#~ "lista over sammenslåtte elementer"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Kopier valgte elementer på tjeneren til plassen før første valgte element "
-#~ "i lista over sammenslåtte elementer"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Kopier valgte lokale elementer til plassen etter første valgte element i "
-#~ "lista over sammenslåtte elementer"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopier valgte elementer på tjeneren til slutten av lista over "
-#~ "sammenslåtte elementer"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Kopier valgte elementer på tjeneren til starten av lista over "
-#~ "sammenslåtte elementer"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Trykk <strong>{0}</strong> for å begynne sammenslåingen av lokal- "
-#~ "og tjeneroppføringer</html>"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Trykk <strong>{0}</strong> for å avslutte sammenslåingen av lokal- "
-#~ "og tjeneroppføringer</html>"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Flytt valgte elementer opp én plass"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Flytt valgte elementer ned én plass"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter «{0}» må ha en verdi"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Kommunikasjon med tjener feilet"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Nullstill ID"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM må fjerne lokalt element med ID {0} fra datasettet.<br>Er "
-#~ "dette OK?</html>"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>For å beholde den lokale versjonen,<br>må JOSM sette ID for {0} {1} "
-#~ "til 0.<br>Tjeneren gir elementet en ny ID neste<br>gang du laster det opp."
-#~ "<br>Er dette OK?</html>"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Bruk ufullstendige løsninger"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Du har ikke løst alle konfliktene ennå.<br>Trykk <strong>{0}</"
-#~ "strong> for å ta i bruk allerede løste konflikter likevel.<br>Du kan løse "
-#~ "gjenværende konflikter senere.<br>Trykk <strong>{1}</strong> for å "
-#~ "fortsette å løse konflikter.</html>"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Mangler attributt «ref» for medlem av relasjon {0}"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "obligatorisk attributt «{0}» mangler"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Mangler attributt «version» for OSM-element med ID {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Ugyldig verdi for attributt «version» for OSM-element med ID {0} – leste "
-#~ "{1}"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "Advarsel: Innstilling «{0}» eller API-versjon «{1}» i datasettet krever "
-#~ "bruk av endringssett, men API kan ikke håndtere dem. Ignorerer "
-#~ "endringssett."
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Klarte ikke åpne tilkobling til API {0}"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} programtillegg lastet ned. Start JOSM på nytt."
-#~ msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt."
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>Openstreetbugs-tillegget bruker den gamle tjeneren på appspot.com."
-#~ "<br>En ny tjener er tilgjengelig på schokokeks.org.<br>Vil du bytte til "
-#~ "den nye tjeneren? (Anbefalt)</html>"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Velg en startnode i enden av en linje"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere "
-#~ "riktig til historikkside for OSM-element. API-URL er «{0}»."
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Lås gjeldende liste over sammenslåtte elementer"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Fjern avgjørelse fra visningskonflikt"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Det oppstod en feil under kommunikasjon med tjeneren.<br>Detaljer: "
-#~ "{0}</html>"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Behold en klone av den lokale versjonen"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr ""
-#~ "Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
-#~ "historikken."
-
-#~ msgid "History item"
-#~ msgstr "Historikkobjekt"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>Advarsel: Passordet lagres i ren tekst i innstillingsfila."
-#~ "<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
-#~ "<br><b>Ikke bruk et verdifullt passord.</b></html>"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr ""
-#~ "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "Uventet ID-format i svar fra tjener – leste «{0}»"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» "
-#~ "– leste «{1}»"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – "
-#~ "leste «{1}»"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «long» (>= 0) – "
-#~ "leste «{1}»"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste "
-#~ "«{1}»"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste "
-#~ "«{1}»"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "EndreRelasjonsmedlemsrolle"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "Justering {0} er ikke registrert ennå. Kan ikke sette deltakelse i "
-#~ "synkronisert justering."
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr ""
-#~ "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar."
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "Uventet kolonneindeks: {0}"
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "Justering {0} er ikke regitrert ennå."
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Slett fra det lokale datasettet"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "Indeks er utenfor rekkevidde: {0}"
-
-#~ msgid "failed to set current. current version {0} not available in history"
-#~ msgstr ""
-#~ "Klarte ikke sette gjeldende versjon. Gjeldende versjon {0} er ikke "
-#~ "tilgjengelig i historikken."
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert "
-#~ "element."
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Nådde slutten av linja"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Nådde et kryss"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Sie können WMS-Einträge in den WMSPlugin-Einstellungen hinzufügen, ändern "
-#~ "und löschen - Diese werden dann im WMS-Menü angezeigt. \n"
-#~ "\n"
-#~ "Sie können dies in den erweiterten Einstellungen auch manuell nach "
-#~ "folgendem Schema erledigen:\n"
-#~ "wmsplugin.url.1.name=LandSat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE-Karten ...\n"
-#~ "\n"
-#~ "Die komplette LandSat-WMS-URL aus dem Beispiel ist:\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg \n"
-#~ "\n"
-#~ "Für die Metacarta-Kartenkorrektur http://labs.metacarta.com/rectifier/ , "
-#~ "muss nur die relevante ID eingegeben werden.\n"
-#~ "Um einen Metacarta-Kartenkorrektur-Menüeintrag anzulegen, erstellen Sie "
-#~ "manuell eine URL wie in folgendem Beispiel(und ersetzen die 73 durch Ihre "
-#~ "Bild-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"
-#~ "Achtung: Stellen Sie sicher, dass die Bilder urheberrechtlicht "
-#~ "unbedenklich sind. Im Zweifel verzichten Sie auf die Nutzung."
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "Klarte ikke importere TangoGPS-data."
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Endre {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Legg til {0} {1}"
-
-#~ msgid "ChangeRelationMemberRole {0} {1}"
-#~ msgstr "EndreRelasjonsmedlemsrolle {0} {1}"
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Lag {0} må være i listen over lag"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Roter {0} {1}"
-
-#~ msgid "RemoveRelationMember {0} {1}"
-#~ msgstr "FjernRelasjonsmedlem {0} {1}"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Sorter valgte relasjonsmedlemmer eller hele listen."
-
-#~ msgid "Unnamed Junction"
-#~ msgstr "Kryss uten navn"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "No data"
-#~ msgstr "Ingen data"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Sone {0}"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geografisk"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikter i data"
-
-#~ msgid "image "
-#~ msgstr "bilde "
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er "
-#~ "tilgjengelig"
-
-#~ msgid "Used style"
-#~ msgstr "Brukt stil"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Tjeneren svarte en feil med kode {0}"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Medlem: {0} (koblet: {1})"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Fjern relasjonsmedlem {0} {1}"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Legg til ny XML kilde i liste."
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "allerede registrert en konflikt for primitiv \"{0}\""
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Du flyttet mere enn {0} elementer. Flytting av et stort antall elementer "
-#~ "er ofte en feil."
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Last ned referansene ..."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
-#~ "HREF=\"{1}\">norsk (bokmål)</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er "
-#~ "tilgjengelig"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Fant ikke noe objekt med ID {0} i dette datasettet"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjelp mangler. Kan lages i <A HREF=\"{0}\">English</A> ellerr <A HREF="
-#~ "\"{1}\">norsk bokmål</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter «{0}» må ha en verdi"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "Uventet returverdi. Mottok {0}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Denne historikken har ikke noe element med versjon {0}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "Fant ingen første versjon. Historikken er tom."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "Fant ingen siste versjon. Historikken er tom."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Uventet kolonneindeks: {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "Indeks er utenfor rekkevidde: {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Vis historikken for det valgte objektet"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Klarte ikke lese «{0}»"
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert "
-#~ "element."
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "Innstilling «{0}» mangler. Kan ikke starte OSM-API."
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – "
-#~ "leste «{1}»"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Kunne ikke lese fil ''{0}''.<br> Feilen er: <br>{1}</html>"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikter under nedlasting"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Venligst velg en gyldig lengdegrad i området -180..180"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Venligst velg en breddegrad i området -90..90"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Du skal til å åpne {0} nettlesere.<br>Dette kan både fylle skjermen din "
-#~ "med nettlesere<br>og kan ta tid for å fullføre."
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Venligst velg en gyldig breddegrad i området -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Venligst velg en lengdegrad i området -180..180"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Slå på og av Fullskjermvisning"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Fullskjermvisning"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Lukk dialogen og ikke opprett et nytt punkt."
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "«{0}» er ikke lukket, og kan derfor ikke være med i sammenføyning."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Linje med «from» har ikke start eller slutt i en «via»-node."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
-
-#~ msgid "Download Object"
-#~ msgstr "Last ned objekt"
-
-#~ msgid "Download Object..."
-#~ msgstr "Last ned objekt..."
-
-#~ msgid "gray"
-#~ msgstr "grå"
-
-#~ msgid "brown"
-#~ msgstr "brun"
-
-#~ msgid "black"
-#~ msgstr "svart"
-
-#~ msgid "white"
-#~ msgstr "hvit"
-
-#~ msgid "blue"
-#~ msgstr "blå"
-
-#~ msgid "red"
-#~ msgstr "rød"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Ugyldig ID. Kan ikke laste ned objekt."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Velg minst to linjer."
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Multipolygon må bestå kun av lukkede linjer."
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Makshøyde (meter)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Maksbredde (meter)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Makslengde (meter)"
-
-#~ msgid "Travel"
-#~ msgstr "Reise"
-
-#~ msgid "Man-Made"
-#~ msgstr "Menneskeskapt"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Oppdater alltid uten å spørre"
+
+#~ msgid "Both"
+#~ msgstr "Begge"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 26529)
+++ applications/editors/josm/i18n/po/nl.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 11:14+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:46+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:42+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ongeldige bestands-URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,15 +119,15 @@
 msgstr "Waarschuwing"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ongeldige URL \"{0}\" wordt genegeerd"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "compatibele) versie van JOSM gebruiken.</li></ul>Meer informatie:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "JOSM verlaten"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Toch proberen door te gaan"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -391,6 +392,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -417,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -423,7 +424,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -431,5 +433,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -641,5 +643,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -891,5 +893,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -898,5 +900,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1085,6 +1087,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1239,5 +1241,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1478,6 +1480,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2159,5 +2161,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2486,7 +2488,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Ophalen data"
@@ -2744,7 +2746,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Negeren uitzondering omdat ophalen afgebroken is. Uitzondering was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2881,10 +2882,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3049,5 +3050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3657,6 +3658,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Verdachte data gevonden. Toch versturen?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3706,40 +3707,40 @@
 msgstr "Knooppunten van {0} werden gewijzigd"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Verwijder \"{0}\" voor knooppunt \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Verwijder \"{0}\" voor weg \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Verwijder \"{0}\" voor relatie \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Zet {0}={1} voor knooppunt ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Zet {0}={1} voor weg ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Zet {0}={1} voor relatie ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Verwijder \"{0}\" voor {1} objecten"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3869,4 +3870,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Bevestig verwijderen"
@@ -4196,10 +4198,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Waarschuwing: Het was niet mogelijk om de voorkeursinstellingen te "
-"initialiseren. Het voorkeursinstellingenbestand kon niet worden teruggezet "
-"naar de standaardinstellingen: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4235,8 +4234,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Waarschuwing; onverwacht JOSM-versienummer in revisiebestand, waarde is "
-"''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4344,11 +4341,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM verwachtte om primitief [{0} {1}] in de dataset te vinden, maar deze is "
-"net aanwezig. Gelieve dit te melden op http://josm.openstreetmap.de . Dit is "
-"geen kritieke fout, het zou veilig moeten zijn om verder te werken zonder "
-"JOSM opnieuw te starten."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4452,5 +4445,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4469,8 +4462,8 @@
 msgstr "multipolygoon"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4623,52 +4616,64 @@
 msgstr "WGS84 Geographisch"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Waarschuwing: invoerstream voor resource ''/data/{0}'' kon niet worden "
-"geopend . NTF<->RGF93 grid kan niet worden geladen"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (Frankrijk)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} tot {2} graden)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC-zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9-zone (Frankrijk)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-zone (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4697,81 +4702,101 @@
 "worden ingesteld in overeenstemming met code ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Zwitsers raster (Zwitserland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Letland TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Noorden"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Zuiden"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Halfrond"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Offset 3.000.000m oostelijk"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Réunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM Frankrijk (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM Geodesisch systeem"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4997,47 +5022,47 @@
 msgstr "Deze test kijkt na of multipolygons geldig zijn"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Gebied is niet gesloten"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Multipolygoonrelatie ontbreekt een lid met als rol outer"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Multipolygoonrelatie ontbreekt stijlinformatie"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Multipolygoonrelatie ontbreekt stijlinformatie"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 "De stijl voor één van de wegen met als rol inner is gelijk aan multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "De stijl voor de weg met als rol outer, komt niet overeen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygoon is niet gesloten"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 "Het lid van de multipolygoonrelatie met als rol inner ligt aan de buitenkant"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Wegen die lid zijn van een multipolygoonrelatie kruisen elkaar"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Een lid van een multipolygoonrelatie heeft een niet-geschikte rol"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Multipolygoonrelatie bevat een lid dat geen ''weg'' is"
@@ -5314,5 +5339,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5337,5 +5362,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5346,5 +5371,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5767,5 +5792,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5833,5 +5858,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "snelweg"
@@ -5839,5 +5864,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5845,10 +5870,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "waterweg"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "grondgebruik"
@@ -5858,5 +5883,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5870,5 +5895,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5881,5 +5906,5 @@
 msgstr "Openbaar vervoer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6252,5 +6277,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6361,4 +6386,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6466,5 +6492,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6513,11 +6539,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Of u kan een <strong>tegeladres</strong> ingeven voor een enkele tegel "
-"het volgende formaat: <i>zoomniveau/x/y</i>, bv. <i>15/256/223</i>. "
-"Tegeladressen in het formaat<i>zoom,x,y</i> or <i>zoom;x;y</i> zijn ook "
-"toegelaten.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6810,9 +6832,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lijst van samengevoegde elementen. Deze zullen de mijn elementen vervangen "
-"wanneer de beslissing tot samenvoegen wordt toegepast."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -7066,10 +7086,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Mijn coördinaten houden"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Hun coördinaten houden"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7128,6 +7148,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7149,6 +7169,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7566,5 +7586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7813,5 +7833,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -8025,7 +8045,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "onbekend"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8291,5 +8341,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8309,5 +8359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8324,5 +8374,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -8332,5 +8382,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Haal onvolledig afgehaalde leden op vanaf de server"
@@ -8373,5 +8423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8379,5 +8429,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8580,5 +8630,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8686,5 +8736,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Gebruiker"
@@ -9683,5 +9732,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9863,5 +9912,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -10019,4 +10068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Enkel wijzigingensets waarvan ikzelf eigenaar ben"
@@ -10033,4 +10083,10 @@
 "Enkel wijzigingensets waarvan de gebruiker met de opgegeven gebruikersnaam "
 "eigenaar is"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10333,9 +10389,9 @@
 msgstr "Deze wijzigingensetaanvraag-URL is ongeldig"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10344,13 +10400,13 @@
 msgstr[1] "Dit zal {0} objecten wijzigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Een lege waarde wist de tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10363,18 +10419,19 @@
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Waarden aanpassen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10383,5 +10440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10391,5 +10448,5 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10398,27 +10455,31 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10427,62 +10488,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Positie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Ga naar  OSM wiki voor help over tags (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Browser starten met wiki-hulp voor het geselecteerde object"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Selecteer relation in main selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10549,11 +10610,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Waarschuwing: uitzondering werd genegeerd omdat de taak werd geannuleerd. "
-"Uitzondering: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10575,7 +10636,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Afhalen van {0} onvolledig kind van {1} ouderrelaties"
-msgstr[1] "Afhalen van {0} onvolledige kinderen van {1} ouderrelaties"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10939,11 +11000,4 @@
 msgstr "Er waren {0} tegenstrijdigheden tijdens het importeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Waarschuwing: Uitzondering wordt genegeerd omdat de taak werd geanulleerd. "
-"Uitzondering: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10984,12 +11038,4 @@
 msgid "Load relation"
 msgstr "Relatie laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Waarschuwing: uitzondering wordt genegeerd omdat de taak werd afgebroken. "
-"Uitzondering was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11278,37 +11324,4 @@
 msgstr "Soort"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "onbekend"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11443,20 +11456,20 @@
 msgstr "Coördinaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Historiek voor knooppunt {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historiek voor weg {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Historiek voor relatie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Historiek opnieuw laden van de server"
@@ -11558,6 +11571,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Wijzigingenset"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12121,8 +12134,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12527,4 +12540,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12550,11 +12564,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12631,38 +12638,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Kleur aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Standaard"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12673,9 +12680,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12683,26 +12690,26 @@
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12711,8 +12718,8 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12721,12 +12728,12 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12735,10 +12742,10 @@
 msgstr[1] "{0} tracks, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12749,78 +12756,78 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12831,11 +12838,11 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12845,6 +12852,6 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12854,27 +12861,27 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12884,29 +12891,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -13010,5 +13017,5 @@
 msgstr "Vond volgende problemen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13018,57 +13025,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13613,10 +13628,10 @@
 msgstr "JPEG-afbeeldingen (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "GPS-marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13624,5 +13639,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13631,26 +13646,26 @@
 msgstr[1] "{0} bestaat uit {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Geluid synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pauzeer het geluid op het moment dat je de synchronisatiehulp hoort."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13658,14 +13673,14 @@
 msgstr "Geluid gesynchroniseerd op punt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan in de afgespeelde laag niet synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Geluidsmarker op afspeelstart zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13695,13 +13710,13 @@
 msgstr "Kan nieuwe geluidsmarker niet aanmaken."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Fout tijdens het tonen van de URL van deze marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL was: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Fouten tijden tonen URL"
@@ -14651,63 +14666,63 @@
 msgstr "Kleuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Teken richting pijlen."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Grenzen gedownload gebied tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuele knopen in selectiemodus tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Inactieve lagen in andere kleur tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14716,10 +14731,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14727,9 +14742,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14737,15 +14752,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Geen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14756,47 +14807,39 @@
 msgstr "Alles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Geen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Grote GPS-punten tekenen"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Snelheid (rood = langzaam, groen = snel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -14804,5 +14847,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14826,5 +14869,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14867,5 +14910,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14879,38 +14922,18 @@
 msgstr "Te voet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14921,10 +14944,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14932,10 +14955,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14944,10 +14967,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14956,10 +14979,10 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14968,5 +14991,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14975,14 +14998,14 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14992,13 +15015,13 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15006,28 +15029,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15697,5 +15738,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15787,5 +15828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Herstellen"
@@ -16066,6 +16107,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Altijd bijwerken zonder te vragen"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16454,5 +16495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16481,9 +16522,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16763,6 +16804,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -17085,5 +17126,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -17295,5 +17336,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17681,4 +17722,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18506,4 +18552,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18623,4 +18671,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19188,5 +19250,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35487,4 +35549,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35501,6 +35564,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35519,15 +35582,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "afgekorte straatnaam"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "éénrichtingstag op een knoop"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "brugtag op een knoop"
@@ -35538,12 +35601,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "gekeerde snelwegtag op een knoop"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr ""
@@ -35552,16 +35615,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "snelweg zonder een referentie"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "type tijdelijke snelweg"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "verkeerd gespelde sleutelnaam"
@@ -35571,10 +35634,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "fietspad met fietstag"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "voetpad met voettag"
@@ -35583,10 +35646,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "maak fietsbaan als strook op een fietspad"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "blokkade gebruikt om een weg"
@@ -35595,35 +35658,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "max. snelheid voor een voetpad"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "laagtag met een + teken"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "straatnaam bevat ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relatie zonder type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurant zonder naam"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "ongebruikelijke tagcombinatie"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35728,117 +35800,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-kaarten"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kaarten (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italië"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilië - Italië"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36083,6 +36165,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Uploaden afgebroken"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36184,9 +36266,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36204,23 +36286,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36228,26 +36340,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informatie"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36255,5 +36395,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36364,9 +36504,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36465,17 +36605,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -37106,28 +37263,35 @@
 msgstr "Gemeente selecteren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Kadaster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Automatisch vullen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37247,9 +37411,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"De oorspronkelijke witte achtergrond vervangen door de achtergrondkleur die "
-"in de JOSM-voorkeuren is opgegeven."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38148,5 +38310,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38156,17 +38318,17 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
@@ -38318,5 +38480,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38324,10 +38486,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38336,5 +38498,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38343,6 +38505,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38351,9 +38513,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38512,71 +38674,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38584,32 +38754,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38644,6 +38808,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38774,30 +38938,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39494,5 +39671,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39509,5 +39686,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40243,17 +40420,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40267,36 +40444,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40918,5 +41091,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41884,4 +42057,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42101,6 +42291,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42347,5 +42537,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42916,5 +43106,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43300,2750 +43490,104 @@
 msgstr ""
 
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Voer een naam in voor de locatie."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecteer eerst een bladwijzer."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Nog niet geïmplementeerd."
-
-#~ msgid "Load Selection"
-#~ msgstr "Selectie laden"
-
-#~ msgid "Downloading..."
-#~ msgstr "Downloaden..."
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "Punt"
-#~ msgstr[1] "Punten"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} verwijderd.)"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punt"
-#~ msgstr[1] "{0} punten"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "afbeelding"
-#~ msgstr[1] "afbeeldingen"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Kan bladwijzer niet schrijven."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Kon bladwijzers niet lezen."
-
-#~ msgid "layer not in list."
-#~ msgstr "laag niet in lijst."
-
-#~ msgid "Unknown version"
-#~ msgstr "Onbekende versie"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Verkeerd wachtwoord of gebruikersnaam."
-
-#~ msgid "position"
-#~ msgstr "positie"
-
-#~ msgid "Aborting..."
-#~ msgstr "Afbreken..."
-
-#~ msgid "different"
-#~ msgstr "verschillend"
-
-#~ msgid "true"
-#~ msgstr "Waar"
-
-#~ msgid "Change"
-#~ msgstr "Aanpassen"
-
-#~ msgid "Move"
-#~ msgstr "Verplaatsen"
-
-#~ msgid "File could not be found."
-#~ msgstr "Bestand kon niet gevonden worden."
-
-#~ msgid "Uploading data"
-#~ msgstr "Gegevens uploaden"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Conflicten oplossen"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Geen tijd voor punt {0} x {1}"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "De geselecteerde laag verwijderen."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Probleem tijdens lezen"
-
-#~ msgid "to"
-#~ msgstr "naar"
-
-#~ msgid "Jump forward"
-#~ msgstr "Naar voren springen"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Sneller vooruit"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Langzaam vooruit"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle wegen zijn leeg"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Openen in browser"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Maak een melding bij {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgid "Change values?"
+#~ msgstr "Waarden aanpassen?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "ongebruikelijke tagcombinatie"
+
+#~ msgid ""
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies "
-#~ "mogelijk)!"
+#~ "De oorspronkelijke witte achtergrond vervangen door de achtergrondkleur "
+#~ "die in de JOSM-voorkeuren is opgegeven."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Uploaden afgebroken"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Hun coördinaten houden"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Mijn coördinaten houden"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins "
-#~ "voordat je de fout meldt."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Voeg zeker de volgende informatie toe:"
+#~ "Negeren uitzondering omdat ophalen afgebroken is. Uitzondering was: {0}"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Altijd bijwerken zonder te vragen"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het "
-#~ "later nog eens."
-
-#~ msgid "Preparing data..."
-#~ msgstr "Gegevens voorbereiden..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Fout tijdens ontleden."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointer-uitzondering, mogelijk ontbreken er tags."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-element in niet-weg gevonden."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Verplicht attribuut \"{0}\" ontbreekt."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> heeft geen referenties"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Ongeldig object met id=0"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Misvormde knoop-id"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-element in niet-relatie gevonden."
-
-#~ msgid "Commit comment"
-#~ msgstr "Opmerking bevestigen"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
-
-#~ msgid "Preparing..."
-#~ msgstr "Voorbereiden…"
-
-#~ msgid "Enter Password"
-#~ msgstr "Voer wachtwoord in"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Uploaden..."
+#~ "Waarschuwing; onverwacht JOSM-versienummer in revisiebestand, waarde is "
+#~ "''{0}''"
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Waarschuwing - verzoek tot laden van {0}-plugin. Deze plugin is niet "
-#~ "langer noodzakelijk."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin niet gevonden: {0}"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin vereist JOSM-update: {0}"
+#~ "JOSM verwachtte om primitief [{0} {1}] in de dataset te vinden, maar deze "
+#~ "is net aanwezig. Gelieve dit te melden op http://josm.openstreetmap.de . "
+#~ "Dit is geen kritieke fout, het zou veilig moeten zijn om verder te werken "
+#~ "zonder JOSM opnieuw te starten."
 
 #~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "(Je kunt het aantal dagen waarna deze waarschuwing "
-#~ "verschijnt<br>instellen via de configuratieoptie 'pluginmanager."
-#~ "warntime'.)"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ "Waarschuwing: Het was niet mogelijk om de voorkeursinstellingen te "
+#~ "initialiseren. Het voorkeursinstellingenbestand kon niet worden "
+#~ "teruggezet naar de standaardinstellingen: {0}"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe "
-#~ "gegevens naar de server."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Niet-opgeslagen wijzigingen"
-
-#~ msgid "x from"
-#~ msgstr "x van"
-
-#~ msgid "zoom level"
-#~ msgstr "zoomniveau"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Voer eerst de gewenste coördinaten in."
-
-#~ msgid "y from"
-#~ msgstr "y van"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Gegevensbronnen en -soorten"
-
-#~ msgid "Download Area"
-#~ msgstr "Gebied downloaden"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Een lege waarde verwijdert de sleutel."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Met OSM-server verbinden..."
-
-#~ msgid "Create new relation"
-#~ msgstr "Nieuwe relatie aanmaken"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Eigenschappen bewerken"
-
-#~ msgid "Add Selected"
-#~ msgstr "Selectie toevoegen"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tags (lege waarde verwijdert de tag)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Bezet door"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Nieuw relatie bewerken"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Relatie #{0} bewerken"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Alle geselecteerde objecten als leden toevoegen"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Ontleden van de serverreactie is mislukt."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Er zijn conflicten tijdens het importeren."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Leden: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klik Herladen om lijst te verversen"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan niet met server verbinden."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Wijzigingen zijn niet opgeslagen. De laag toch verwijderen?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Wil je de hele laag zeker verwijderen?"
+#~ "Waarschuwing: invoerstream voor resource ''/data/{0}'' kon niet worden "
+#~ "geopend . NTF<->RGF93 grid kan niet worden geladen"
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "De staat van alle geselecteerde objecten terugdraaien naar de versie "
-#~ "geselecteerd in de geschiedenislijst."
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "De laag hier direct onder samenvoegen bij de geselecteerde laag."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Tekst/pictogrammen tonen/verbergen"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "De geselecteerde lijst herladen."
-
-#~ msgid "name"
-#~ msgstr "naam"
-
-#~ msgid "Do not show again"
-#~ msgstr "Niet meer tonen"
-
-#~ msgid "Timespan: "
-#~ msgstr "Tijdsperiode: "
-
-#~ msgid "Length: "
-#~ msgstr "Lengte: "
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Afbeeldingen van {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "GPX inlezen..."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "De basis-URL voor de OSM-server (REST API)"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Backupbestanden behouden"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Ingebouwde standaarden ingeschakelen"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Plugin-informatie van {0} site downloaden"
-#~ msgstr[1] "Plugin-informatie van {0} sites downloaden"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Geen plugin-informatie gevonden."
-
-#~ msgid "Download List"
-#~ msgstr "Lijst downloaden"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin bestaat al"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Fout tijdens lezen plugin-informatiebestand: {0}"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alle geïnstalleerde plugins zijn bijgewerkt."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: versie {1}{2}"
+#~ "<html>Of u kan een <strong>tegeladres</strong> ingeven voor een enkele "
+#~ "tegel het volgende formaat: <i>zoomniveau/x/y</i>, bv. <i>15/256/223</i>. "
+#~ "Tegeladressen in het formaat<i>zoom,x,y</i> or <i>zoom;x;y</i> zijn ook "
+#~ "toegelaten.</html>"
 
 #~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "De volgende plugins bijwerken:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxyserverhost"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxyinstellingen"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Ontbrekende plugins downloaden"
+#~ "Lijst van samengevoegde elementen. Deze zullen de mijn elementen "
+#~ "vervangen wanneer de beslissing tot samenvoegen wordt toegepast."
 
 #~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "De volgende plugins downloaden?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Proxyserver inschakelen"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anoniem"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxyserverpoort"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Gebruikersnaam proxyserver"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Wachtwoord proxyserver"
+#~ "Waarschuwing: uitzondering werd genegeerd omdat de taak werd geannuleerd. "
+#~ "Uitzondering: {0}"
 
 #~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Maximum lengte (in meters) om lijnen tekenen. Kies '-1' om alle lijnen "
-#~ "tekenen."
+#~ "Waarschuwing: Uitzondering wordt genegeerd omdat de taak werd "
+#~ "geanulleerd. Uitzondering: {0}"
 
 #~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de "
-#~ "vorige."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Toegestane opdrachten"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "Alle remote-controlopdrachten handmatig bevestigen"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Bedankt voor je begrip</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>De pseudo-aanpasser 'uitgeschakeld' zal de sneltoets uitschakelen als "
-#~ "het deze tegenkomt.</p>"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Open bestand (als rawe GPS, indien .gpx)"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Bijgewerkte plugins activeren"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parameters worden ingelezen in de volgorde waarin ze zijn opgegeven, dus\n"
-#~ "zorg dat je wat gegevens laadt voor --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Er zijn problemen met de volgende plugins:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
-#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Plugins bijwerken"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "RemoveRelationMember"
-
-#~ msgid "Rotate"
-#~ msgstr "Roteren"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kan plugin niet downloaden: {0} van {1}"
-
-#~ msgid "File not found"
-#~ msgstr "Bestand niet gevonden"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Verwijder \"{0}\" voor {1} {2}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Selectie \"{0}\" wordt gebruikt door relatie \"{1}\" met rol {2}.\n"
-#~ "Uit relatie verwijderen?"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Verwijder \"{0}\" voor {1} ''{2}''"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "{0} {1} verwijderen"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "{1} {0} verwijderen"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Selectie \"{0}\" wordt gebruikt door relatie \"{1}\".\n"
-#~ "Verwijder van relatie?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Conflicterende relatie"
-
-#~ msgid "Split way segment"
-#~ msgstr "Wegsegment splitsen"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert-zone (Frankrijk)"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Graden minuten seconden"
-
-#~ msgid "S"
-#~ msgstr "Z"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "W"
-
-#~ msgid "E"
-#~ msgstr "O"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Kan het bestand \"{0}\" niet hernoemen."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Waarden voor alle conflicten invoeren."
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Een lidmaatschapsrelatie gebaseerd op een rol is gekopieerd naar alle "
-#~ "nieuwe wegen.\n"
-#~ "Je moet dit controleren en waar nodig corrigeren."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Deze veranderingen uploaden?"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Onbekende zinnen: "
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Misvormde zinnen: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Controlegetalfouten: "
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Ontleedfout in URL: \"{0}\""
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Sommige knopen zitten (bijna) op de lijn"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Sluithaak verwacht."
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Het herstellen van backupbestand is mislukt."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Kan van bestand geen backup maken."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer "
-#~ "dit als fout a.u.b."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Een wegsegment verslepen om een rechthoek te maken."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Klik om te verwijderen. SHIFT: verwijder wegsegment. ALT: ongebruikte "
-#~ "knopen behouden bij verwijderen van een weg. CTRL: verwijzende objecten "
-#~ "verwijderen."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Objecten selecteren, verplaatsen en roteren"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Minstens twee knopen selecteren om samen te voegen."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze "
-#~ "toch samenvoegen?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Knopen met verschillende relaties samenvoegen?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Kan knopen niet samenvoegen: zou daarvoor een weg moeten verwijderen die "
-#~ "nog in gebruik is."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn."
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Selectie mag slechts wegen bevatten."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Slechts twee knopen toegestaan"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Slechts één knoop geselecteerd"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Je gebruikt projectie EPSG:4326 die kan leiden tot<br>ongewenste "
-#~ "resultaten bij het rechthoekig uitlijnen.<br>Verander je projectie om "
-#~ "deze waarschuwing te verwijderen.<br>Wil je verder gaan?"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Deze knopen staan niet in een cirkel."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Selecteer precies drie knopen of een weg met precies drie knopen."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Decimale graden gebruiken."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Geen van deze wegknopen is met iets anders verbonden"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "De projectie \"{0}\" is alleen ontwikkeld\n"
-#~ "voor breedtegraden tussen 46.1° and 57°.\n"
-#~ "Gebruik een andere projectie als je geen\n"
-#~ "gebruik maakt van een Franse WMS-server.\n"
-#~ "Upload geen gegevens na deze melding."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Naar OSM uploaden..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Sites configureren..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden "
-#~ "door de bestaande te verwijderen?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Wijzigingen niet toepassen"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Lid \"{0}\" in relatie wissen."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Relatie bevat leeg lid."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Multipolygone weg \"{0}\" is niet gesloten."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Weg \"{0}\" met minder dan twee punten."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Binnenweg \"{0}\" is uitwendig."
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Importeren NMEA is mislukt!"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Fout: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Waarschuwing: {0}"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Niet-weg \"{0}\" in multipolygoon."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Samenvoegconflicten."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Coördinaten van de nieuwe knoop invoeren."
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Voorkeurenbestand bevat fouten. Backup maken van de oude naar {0}."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender-optie"
-
-#~ msgid "error loading metadata"
-#~ msgstr "laden van metadata is mislukt"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "TCX-bestand importeren..."
-
-#~ msgid "image not loaded"
-#~ msgstr "afbeelding is niet geladen"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy-kaart"
-
-#~ msgid "Request Update"
-#~ msgstr "Update aanvragen"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Tegelstatus tonen"
-
-#~ msgid "error requesting update"
-#~ msgstr "update aanvragen is mislukt"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Tegelbronnen"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Voorkeuren WMS-plugin"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Een menunaam en WMS-URL invoeren"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS-URL"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Lijst met WMS-servers bewerken die in het WMS-pluginmenu worden getoond"
-
-#~ msgid "Copy Default"
-#~ msgstr "Standaardwaarde kopiëren"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS-URL (standaard)"
-
-#~ msgid "gps track description"
-#~ msgstr "GPS-trackomschrijving"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "Een track met {0} punt"
-#~ msgstr[1] "Een track met {0} punten"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} bestaat uit {1} track"
-#~ msgstr[1] "{0} bestaat uit {1} tracks"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} binnen de track."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "TCX-bestand als GPS-track importeren"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-track geladen"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Afbeeldings-id Metacarta Map Rectifier"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier-id={0}"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr ""
-#~ "Geogerefereerde afbeelding van Metacarta's Map Rectifier WMS downloaden"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, "
-#~ "bewerken en wissen - deze zullen in het WMS-menu getoond worden.\n"
-#~ "\n"
-#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, "
-#~ "gebruikmakend van het volgende schema:\n"
-#~ "wmsplugin.url.1.name=Landsat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE Maps... enzovoort\n"
-#~ "\n"
-#~ "Volledig voorbeeld van een WMS-URL (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"
-#~ "Voor de Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) "
-#~ "moet je de betreffende 'id' invoeren.\n"
-#~ "Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een "
-#~ "URL volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je "
-#~ "eigen afbeeldings-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"
-#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij "
-#~ "twijfel: niet gebruiken."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Upload alle aanpassingen naar de OSM-server."
-
-#~ msgid "Next Marker"
-#~ msgstr "Volgende marker"
-
-#~ msgid "Play next marker."
-#~ msgstr "Speel vanaf volgende marker"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Vorige marker"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Speel vanaf vorige marker"
-
-#~ msgid "Jump back."
-#~ msgstr "Spring terug"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Kan niet lezen van URL: \"{0}\""
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Ontbrekende argumenten voor OR."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Ontbrekend argument voor NOT."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-gebruikersnaam (e-mail)"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM-wachtwoord"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>WAARSCHUWING: het wachtwoord wordt als gewone tekst in het "
-#~ "voorkeurenbestand opgeslagen<br>en ook als gewone tekst naar de server "
-#~ "verzonden, verwerkt in de URL.<br><b>Gebruik dus geen waardevol "
-#~ "wachtwoord.</b></html>"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "WMS-tegel downloaden van {0}"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "De positie van de WMS-laag aanpassen"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Uitzondering opgetreden"
-
-#~ msgid "help"
-#~ msgstr "hulp"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "WMS-pluginhulp"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigatie"
-
-#~ 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 ""
-#~ "Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
-#~ "gegevensgebied.\n"
-#~ "Hierdoor kunnen knopen onbedoeld gewist worden.\n"
-#~ "Weet je zeker dat je verder wilt gaan?"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Dubbele sneltoets voor knop '{0}' - knop wordt genegeerd!"
-
-#~ msgid "start"
-#~ msgstr "Begin"
-
-#~ msgid "end"
-#~ msgstr "einde"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Kan geen nieuwe fout aanmaken. Resultaat: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Een van de geselecteerde bestanden was leeg!!!"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotagged-afbeeldingen"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Ik bevind mij in tijdzone: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Open een andere foto"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Ik kan een foto van mijn GPS-ontvanger maken.<br>Zou dat helpen?</"
-#~ "html>"
-
-#~ msgid "Update position for: "
-#~ msgstr "Locatie bijwerken van: "
-
-#~ msgid "All images"
-#~ msgstr "Alle afbeeldingen"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Afbeelding zonder EXIF-locatie"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Nog niet getagde afbeeldingen"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Afbeeldingen openen met AGPifoJ..."
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Richtingsindex '{0}' niet gevonden"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Voer een zoekstring in"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan locatiezoekresultaten van server niet lezen"
-
-#~ msgid "near"
-#~ msgstr "nabij"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "load data from API"
-#~ msgstr "gegevens uit API laden"
-
-#~ msgid "change the selection"
-#~ msgstr "de selectie aanpassen"
-
-#~ msgid "change the viewport"
-#~ msgstr "het venster aanpassen"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Een plugin waarmee JOSM door andere applicaties geregeld kan worden."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Instellingen voor de Afstandsbedieningsplugin."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "De Afstandsbedieningsplugin luistert naar poort 8111 op localhost. De "
-#~ "poort kan niet ingesteld worden omdat er naar verwezen wordt door externe "
-#~ "applicaties die met deze plugin communiceren."
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: muiswiel of dubbelklik.  Verplaats kaart: rechter muisknop "
-#~ "indrukken en muis bewegen. Selecteer"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Locatie van rasteroorsprong"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rasterrotatie"
-
-#~ msgid "World"
-#~ msgstr "Wereld"
-
-#~ msgid "Grid layout"
-#~ msgstr "Rasterindeling"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Rasterlaag:"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Valideer de huidige selectie of de totale gegevensset."
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "De geselecteerde fouten herstellen."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "De geselecteerde fouten de volgende keer negeren."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Gegevens met fouten. Toch uploaden?"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "De test controleert of twee wegen, spoorwegen of waterwegen elkaar in "
-#~ "dezelfde laag kruisen, terwijl ze niet door dezelfde knoop verbonden zijn."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Ongetagde en niet-verbonden knopen"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Ongeldige tag/waarde-combinaties"
-
-#~ msgid "Painting problem"
-#~ msgstr "Tekenprobleem"
-
-#~ msgid "Goods"
-#~ msgstr "Goederen"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorboot"
-
-#~ msgid "Boat"
-#~ msgstr "Pleziervaart"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ruiterpad"
-
-#~ msgid "Cycleway"
-#~ msgstr "Fietspad"
-
-#~ msgid "Footway"
-#~ msgstr "Voetpad"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Opent het OpenStreetBugs-scherm en activeert de automatische download"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Auteurs: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lagen: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflicten: {0}"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Bron tagvoorkeuze"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "De bronnen (URL of bestandsnaam) van bestanden met "
-#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/"
-#~ "TaggingPresets voor hulp."
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Een nieuwe tagvoorkeuzebron aan de lijst toevoegen."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Bronnen tagvoorkeuzen"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kan voorkeurenmap niet openen: {0}"
-
-#~ msgid "History of Element"
-#~ msgstr "Elementgeschiedenis"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Open het voorkeurenscherm voor algemene instellingen."
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Weg dupliceren"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Geselecteerde wegen dupliceren."
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Kan geen niet-geordende weg dupliceren."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Weg dupliceren"
-
-#~ msgid "Grid"
-#~ msgstr "Raster"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Controleer op tekenknopen."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Controleer of kaarttekenen fouten heeft gevonden."
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Auteurspaneel tonen"
-
-#~ msgid "Open User Page"
-#~ msgstr "Gebruikerspagina openen"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Gebruikerspagina in browser openen"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Gebruikers' gegevens selecteren"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Selectie vervangen door gegevens gebruiker"
-
-#~ msgid "Please select some data"
-#~ msgstr "Enkele gegevens selecteren a.u.b."
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Via het auteurspaneel een gebruiker kiezen"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Helaas, werkt niet voor anonieme gebruikers"
-
-#~ msgid "standard"
-#~ msgstr "standaard"
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Het opslaan is mislukt."
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Wandelen bewerken"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Bergwandelen"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Bergwandelen bewerken"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Bergwandelen (stevig)"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Bergwandelen (stevig) bewerken"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Bergklimmen"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Bergklimmen bewerken"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Kabelbrug"
-
-#~ msgid "Portcullis"
-#~ msgstr "Valhek"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Waterwegpunt"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "De plugin kan niet worden verwijderd. Informeer de ontwikkelaars van JOSM "
-#~ "over dit probleem."
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Een onverwachte uitzondering is opgetreden.\n"
-#~ "\n"
-#~ "Dit is altijd een programmeerfout. Als je de nieuwste versie\n"
-#~ "van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Oppervlak van weg is niet gesloten."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
-
-#~ msgid "false"
-#~ msgstr "onwaar"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Los {0} conflicten in {1} objecten op"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
-#~ "gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die "
-#~ "je niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Nulcoördinaten: "
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. "
-#~ "Weet u zeker dat u ze wilt combineren?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Wegen combineren ondanks verschillende relaties?"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Selecteer tenminste één taak om te downloaden"
-
-#~ msgid "Create a new map."
-#~ msgstr "Een nieuwe kaart aanmaken."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr ""
-#~ "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen."
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Geschiedenis van OSM-wegen of -knopen weergeven."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Geen document geopend, dus ook niets om op te slaan."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Onbekende bestandsextentie."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Verbinden met {0}..."
-
-#~ msgid "No data imported."
-#~ msgstr "Geen gegevens geïmporteerd."
-
-#~ msgid "Data Layer"
-#~ msgstr "Gegevenslaag"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online-hulp"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fout tijdens het laden van {0}"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Voorkeuzegroep ''{0}''"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen."
-
-#~ msgid "Set the language."
-#~ msgstr "De taal instellen."
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Het activeren van de bijgewerkte plugins is mislukt. Controleer of JOSM "
-#~ "rechten heeft om de bestaande plugins te overschrijven."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS-start: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS-einde: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "Huidige verschil: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "Tijdzoneverschil: "
-
-#~ msgid "Sync clock"
-#~ msgstr "Klok synchroniseren"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Ingevoerde tijd kon niet worden ontleed."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Merk op dat sneltoetsen aan opdrachten worden toegewezen bij het "
-#~ "opstarten van JOSM. Je moet JOSM dus <b>herstarten</b> om de "
-#~ "veranderingen te merken.</p>"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Loginnaam (e-mail) van het OSM-account."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
-
-#~ msgid "Base Server URL"
-#~ msgstr "URL-basisserver"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Opdrachtenlijst: {0}"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} object heeft een conflict:"
-#~ msgstr[1] "{0} objecten hebben een conflict:"
-
-#~ msgid "my version:"
-#~ msgstr "mijn versie:"
-
-#~ msgid "their version:"
-#~ msgstr "hun versie:"
-
-#~ msgid "resolved version:"
-#~ msgstr "samengevoegde versie:"
-
-#~ msgid "requested: {0}"
-#~ msgstr "verzocht: {0}"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "De rij om te kopiëren selecteren."
-
-#~ msgid "Help / About"
-#~ msgstr "Hulp / Over"
-
-#~ 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] ""
-#~ "De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?"
-#~ msgstr[1] ""
-#~ "De selectie bevat {0} wegen. Weet je zeker dat je ze allemaal wilt "
-#~ "vereenvoudigen?"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server ondersteunt geen changesets"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "park_and_ride"
-#~ msgstr "Parkeer en Reis"
-
-#~ msgid "Shop"
-#~ msgstr "Winkel"
-
-#~ msgid "Edit Station"
-#~ msgstr "Station bewerken"
-
-#~ msgid "Accomodation"
-#~ msgstr "Accomodatie"
-
-#~ msgid "map"
-#~ msgstr "kaart"
-
-#~ msgid "citymap"
-#~ msgstr "stadskaart"
-
-#~ msgid "hikingmap"
-#~ msgstr "wandelkaart"
-
-#~ msgid "bicyclemap"
-#~ msgstr "fietskaart"
-
-#~ msgid "board"
-#~ msgstr "bord"
-
-#~ msgid "football"
-#~ msgstr "Football"
-
-#~ msgid "rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Changeset openen"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Lange straat</b> - 'Lange' en 'straat' in een sleutel of naam."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Lange straat\"</b> - 'Lange' en 'straat' in een sleutel of naam."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - object met opgegeven ID"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Gebruik <b>\"</b> om operanten aan te halen (b.v. als sleutel \":\" bevat)"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren."
-
-#~ msgid "Football"
-#~ msgstr "Football"
-
-#~ msgid "Edit Football"
-#~ msgstr "Football bewerken"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Rugby bewerken"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Hoeveelheid draden"
-
-#~ msgid "Charge"
-#~ msgstr "Lading"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Voer een zoekopdracht in:"
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Lange</b> - 'Lang' ergens in de naam."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Lange</b> - geen 'Lang' in de naam."
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - object met opgegeven aantal knopen"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motorracen"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Motorracen bewerken"
-
-#~ msgid "Amenities"
-#~ msgstr "Voorzieningen"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "BELANGRIJK: gegevens gepositioneerd ver\n"
-#~ "van de huidige Lambert-zonelimieten.\n"
-#~ "Upload geen gegevens na deze melding.\n"
-#~ "Maak je laatste opdracht ongedaan, sla\n"
-#~ "je werk op en start een nieuwe laag in de\n"
-#~ "nieuwe zone."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Syncroniseer tijd met GPS-apparaat"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track (klasse 1)"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track (klasse 2)"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track (klasse 3)"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track (klasse 4)"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track (klasse 5)"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Meer dan een \"naar\"-weg gevonden."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Meer dan een \"van\"-weg gevonden."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Geen \"naar\"-weg gevonden."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Stijl voor beperking {0} is niet gevonden."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Geen \"van\"-weg gevonden."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Onbekende rol \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Onbekend lidtype voor \"{0}\"."
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Toon geogetagde foto's"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} zijn getagd als GPS"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} te gaan. Uploading {4}: {5} (id: {6})"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Openbaar"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Afbeelding van Franse Cadastre WMS downloaden"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Eerst een laag openen (GPX, OSM, buffer)"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Een nieuwe laag toevoegen"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Stel in {0}={1} voor {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Stel in {0}={1} voor {2} {3}"
-
-#~ msgid "Zone"
-#~ msgstr "Zone"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Stel handmatig de Lambert-zone in (b.v. voor locaties tussen twee zones)"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Bron auto-tag toegevoegd:"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Verander de JOSM-projectie en herstart om\n"
-#~ "de kadaster-WMS-plugin in te schakelen."
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Bufferbestand Lambert-zone 1 (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Bufferbestand Lambert-zone 3 (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Bufferbestand Lambert-zone 2 (.2)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambert-zone"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambert-zone {0} in buffer is niet compatibel met huidige Lambert-zone {1}"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Een speciale bewerker van de Franse kadaster WMS op www.cadastre.gouv."
-#~ "fr<BR><BR>Lees de gebruiksvoorwaarden (in het Frans): <br><a href="
-#~ "\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html"
-#~ "\"> http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr."
-#~ "html</a> <BR>voor het uploaden van gegevens die met deze plugin zijn "
-#~ "gemaakt."
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Image-grab-vermenigvuldiger"
-
-#~ msgid "No password provided."
-#~ msgstr "Geen wachtwoord opgegeven."
-
-#~ msgid "No username provided."
-#~ msgstr "Geen gebruikersnaam opgegeven."
-
-#~ msgid "intermedia"
-#~ msgstr "middelzwaar"
-
-#~ msgid "advance"
-#~ msgstr "gevorderd"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Slijterij bewerken"
-
-#~ msgid "sports"
-#~ msgstr "Sportartikelen"
-
-#~ msgid "optician"
-#~ msgstr "Opticiën"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Bufferbestand Lambert-zone 4 (.4)"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Sla op en verlaat JOSM"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Alle nu geselecteerde objecten uit relatie verwijderen"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Geselecteerde verwijderen"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Middelpunt raster: {0}"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "De positie van de geselecteerde WMS-laag aanpassen"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Max. hoogte (meters)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Max. breedte (meters)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Max. lengte (meters)"
-
-#~ msgid "Move Down"
-#~ msgstr "Omlaag bewegen"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relatie-editor: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Conflict oplossen"
-
-#~ msgid "Move Up"
-#~ msgstr "Omhoog bewegen"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Laag verwijderen"
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Geen \"via\"-knoop of -weg gevonden."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Meer dan éé \"via\" gevonden."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Kleur punten en tracksegmenten op basis van de afwijking van de locatie "
-#~ "(HDOP). Uw GPS-logger moet deze informatie wel registreren."
-
-#~ msgid "Delete and Download"
-#~ msgstr "Verwijder en download"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Plugins downloaden"
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Toch combineren"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Conflicten oplossen"
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Selecteer a.u.b. minstens één knoop, weg of relatie. Alleen elementen die "
-#~ "reeds geupload zijn hebben een geschiedenis."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Toch samenvoegen"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch "
-#~ "doorgaan?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Werkt de huidige gegevenslaag bij vanaf de server (opnieuw downloaden van "
-#~ "gegevens)"
-
-#~ msgid "Update Data"
-#~ msgstr "Gegevens bijwerken"
-
-#~ msgid "autozoom"
-#~ msgstr "auto-zoom"
-
-#~ msgid "autoload tiles"
-#~ msgstr "auto-laden tegels"
-
-#~ msgid "SlippyMap"
-#~ msgstr "Slippy-kaart"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Instellingen voor de Slippy-kaartplugin"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Auto-zoom: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Auto-laden tegels: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max. zoom |v|: "
-
-#~ msgid "Fade background: "
-#~ msgstr "Achtergrond vervagen: "
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Daarnaast worden de sneltoetsen geactiveerd als de opdrachten voor de "
-#~ "eerste keer aan een menuitem toegekend zijn. Daarom kunnen sommige "
-#~ "veranderingen al actief zijn zonder herstart --- maar dus ook zonder de "
-#~ "controle op conflicterende opdrachten. Dit is een tweede reden om JOSM na "
-#~ "het maken van de veranderingen te <b>herstarten</b>.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Het kan je opgevallen zijn dat de toetsenselectielijst op de volgende "
-#~ "pagina alle toetsen weergeeft op alle soorten toetsenborden die bekend "
-#~ "zijn bij Java, en niet alleen de toetsen van jouw toetsenbord. Gebruik "
-#~ "alleen die waarden die overeenkomen met een bestaande toets van je "
-#~ "toetsenbord. Dus als je toetsenbord geen Copy-toets heeft (PC-"
-#~ "toetsenborden hebben hem niet, Sun-toetsenborden wel), gebruik deze toets "
-#~ "dan ook niet. Ook zullen er 'toetsen' in de lijst staan die overeenkomen "
-#~ "met een sneltoets op je toetsenbord (b.v. ':'). Gebruik deze ook niet, "
-#~ "maar in plaats daarvan de basistoets (';' op US-toetsenborden, '.' op "
-#~ "Duitse toetsenborden, enz.). Als je deze regels overtreedt kunnen er "
-#~ "conflicten ontstaan omdat JOSM niet kan weten dat CTRL+SHIFT+; en CTRL+: "
-#~ "op een US-toetsenbord eigenlijk hetzelfde is...</p>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>De laatste pagina bevat de aanpastoetsen die JOSM automatisch toekent "
-#~ "aan sneltoetsen. Voor ieder van de vier soorten sneltoetsen zijn er drie "
-#~ "alternatieven. Als er zich een conflict voordoet zal JOSM deze "
-#~ "alternatieve uitproberen in de getoonde volgorde. Als alle alternatieven "
-#~ "al bezet zijn, zal JOSM een willekeurige sneltoets kiezen.</p>"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Objecten verplaatsen door slepen; Shift voegt toe (Ctrl wisselt); Shft-"
-#~ "Ctrl roteert selectie; of verander selectie"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Verander eerste de projectie in {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Onjuiste projectie"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Grondafdruk gebouw uitnemen"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Tableau d'Assemblage selecteren"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Stad/dorp {0} is niet gevonden of niet beschikbaar in WMS.\n"
-#~ "Controleer de beschikbaarheid op www.cadastre.gouv.fr"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Toch doorgaan"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd."
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden."
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "De selecteerde foto's bevatten geen tijdinformatie."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Foto's bevatten geen tijdinformatie."
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}"
-
-#~ msgid "Default Values"
-#~ msgstr "Standaardwaarden"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Tijdverschil van {0} dagen)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "{0} van de {1} foto's komen overeen met GPX-track."
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de "
-#~ "schuifbalken handmatig aanpassen zodat ze met de foto's overeenkomen."
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend "
-#~ "of gedownload?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Tijdens bulkdownload traden de volgende fouten op:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Fouten tijdens download"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Klasse-1-track bewerken"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Klasse-2-track bewerken"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Klasse-3-track bewerken"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Klasse-4-track bewerken"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Klasse-5-track bewerken"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Bergklimmen (stevig)"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Bergklimmen (stevig) bewerken"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Bergklimmen (moeilijk)"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Bergklimmen (moeilijk) bewerken"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Kabelbrug bewerken"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Valhek bewerken"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- uitgevoerde versie is {0}"
-
-#~ msgid "Full Screen"
-#~ msgstr "Volledig scherm"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "De projectie \"{0}\" is alleen ontworpen voor\n"
-#~ "breedtegraden  tussen 45.7° en 47.9°\n"
-#~ "en lengtegraden tussen 5.7° en 10.6°.\n"
-#~ "Gebruik een ander projectie-systeem als u niet werkt met\n"
-#~ "een gegevensverzameling van Zwitserland of Liechtenstein.\n"
-#~ "Upload geen gegevens na dit bericht."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Duplicaatknopen {0} in {1} knopen"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "De projectie kon niet worden gelezen uit de voorkeuren. Mercator wordt "
-#~ "gebruikt."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - sleutel 'type' met exacte waarde 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - sleutel 'type' met elke waarde. Probeer ook <b>*=value</"
-#~ "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "De helppagina bestaat niet. Maak hem aan in het <A HREF=\"{0}\">Engels</"
-#~ "A> of in <A HREF=\"{1}\">je eigen taal</A>."
-
-#~ msgid "Resolve conflicts in member list of of relation {0}"
-#~ msgstr "Conflicten in ledenlijst van relatie {0} oplossen"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Volledig scherm aan-/uitzetten"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Los {0} tag-conflicten op in {1} {2}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Versieconflicten voor {0} {1} oplossen"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Tags ({0} conflicten)"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} tag-conflicten om op te lossen"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Geselecteerde elementen één positie omhoog schuiven"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' mag niet leeg zijn"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Lengte van de waarde voor label \"{0}\" van onderdeel {1} overschrijdt de "
-#~ "maximumwaarde {2}. De lengte is nu {3}."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum "
-#~ "is {1}"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Tegenstrijdigheden in de gegevens"
-
-#~ msgid "No data"
-#~ msgstr "Geen gegevens"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Vernieuwen van de geselecteerde entiteit is niet gelukt."
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Een relatielidmaatschap is naar alle wegen gekopieerd.\n"
-#~ "Verifieer dit, en maak aanpassingen als dat nodig is."
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synchroniseer alleen {0} {1}"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Tegenstrijdigheid ontdekt"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr ""
-#~ "Wijzigingen zijn niet opgeslagen. Deze wijzigingen negeren en verder gaan?"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Kan \"{0}\" niet lezen"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Kon bestand ''{0}' niet lezen'.<br> Error is: <br>{1}</html>"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Update de objecten in de huidige data laag van de server."
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Kon geen object met id {0} in de huidige dataset vinden"
-
-#~ msgid "Update selections"
-#~ msgstr "Selectie updaten"
-
-#~ msgid "Update Selection"
-#~ msgstr "Update selectie"
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr ""
-#~ "Upload alle veranderingen in de huidige data laag naar de OSM server"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Er zijn onopgeloste conflicten in laag ''{0}''.<br>U dient deze "
-#~ "eerst op te lossen</html>"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upload naar OSM API gefaald"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Geef een filter string."
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Kan niet zoeken omdat er geen data geladen is"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Error tijdens het communiceren met de server."
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "U staat op het punt {0} browser vensters te openen. <br> Dit kan zowel uw "
-#~ "scherm met browser vensters vullen <br> als een behoorlijke tijd duren."
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Graag een geldige breedtegraad in voeren tussen -90 en 90"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Graag een breedtegraad invoeren tussen -90 en 90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Graag een geldige lengtegraad invoeren tussen -180 en 180"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Graag een lengtegraad invoeren tussen -180 en 180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Sluit het venster zonder een nieuwe knoop te maken"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 benodigd, kreeg {0}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflikten gedurende ophalen"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
-
-#~ msgid "Fix relations"
-#~ msgstr "Relaties gerepareerd"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Zichzelf overlappend gebied samengevoegd"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Samenvoegen gebieden: Korte wegen verwijderd"
-
-#~ msgid "Closed Way"
-#~ msgstr "Gesloten weg"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "aan {0} primitief"
-#~ msgstr[1] "aan {0} primitieven"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Versturen <strong>mislukt</strong> omdat u <br>wijzigingenset {0} "
-#~ "heeft gebruikt, welke reeds gesloten was op {1}.<br>Gaarne opnieuw "
-#~ "versturen met een nieuwe of bestaande open wijzigingenset.</html>"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Aanpassen primitief"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Versturen van {0} objecten ..."
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Verwijderde of verplaatste primitieven"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Er zijn {0} primitieven in uw lokale dataset die<br>verwijderd "
-#~ "zouden kunnen zijn op de server. Indien u deze later probeert te "
-#~ "verwijderen of wijzigen<br>zal de server waarschijnlijk een <br>conflikt "
-#~ "rapporteren.<br><br>Klik <strong>{1}</strong> om de staat van deze "
-#~ "primitieven<br>op de server te controleren.<br>Klik <strong>{2}</strong> "
-#~ "om te negeren.<br></html>"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Sleep een wegdeel om een rechthoek te maken. Ctrl-sleep om een segment "
-#~ "langs zijn loodlijn te verplaatsen."
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Verkeerd aantal parameters voor tags operator"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Onjuist aantal waardes voor tags operator: {0}. Tags operator verwacht "
-#~ "aantal tags, of bereik, bijvoorbeeld tags:1 of  tags:2-5"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Onjuit aantal parameters voor knooppunten operator"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Onjuiste waarde van id operator: {0}. Verwachtte nummer"
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Onjuiste waarde voor knooppunten operator: {0}. Knooppunten operator "
-#~ "verwacht aantal knooppunten, of bereik, bijvoorbeeld knooppunten:10-20"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Patroon syntax fout: Patroon {0} in {1} is illegaal!"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relaties maken een circel omdat ze naar elkaar verwijzen."
-#~ "<br>JOSM kan ze niet versturen.  Graag de relaties aanpassen door de "
-#~ "wederzijdse afhankelijkheid te verwijderen.</html>"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Kan commando \"{0}\" niet terugdraaien omdat laag  \"{1}\" niet meer "
-#~ "aanwezig is"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Waarschuwing: Laag ''{0}'' bestaat niet meer. 'Kan niet verwijderen' "
-#~ "conflikt voor primitief ''{1}''."
-
-#~ msgid "Added {0} objects"
-#~ msgstr "{0} objecten toegevoegd"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Laag ''{0}'' heeft reeds een conflikt voor primitief<br>''{1}''."
-#~ "<br>Dit conflikt kan niet worden toegevoegd.</html>"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "\"{0}\" objecten verwijderd"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr ""
-#~ "Tenminste één object benodigd voor verwijderen, kreeg lege verzameling"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr ""
-#~ "<html>Kan directory niet openen.<br>Selecteer alstublieft een bestand!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Bezig met {0} bestanden te openen..."
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Juiste tekens ontbreken"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Los versie conlict voor weg {0} op"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Los versie conflict voor knooppunt {0} op"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Onjuiste dubbele waarde \"{0}\""
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Los versie conflict voor relatie {0} op"
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Waarschuwing: het revisie bestan '/REVISION' ontbreekt."
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Samenvoeg doel voor object met id {0} ontbreekt"
-
-#~ msgid "H"
-#~ msgstr "V"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "R"
-#~ msgstr "V"
-
-#~ msgid "A"
-#~ msgstr "T"
-
-#~ msgid "D"
-#~ msgstr "V"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Waarschuwing: Laag ''{0}'' bestaat niet meer. 'Kan niet verwijderen' "
-#~ "conflikt voor primitief ''{1}''."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
-
-#~ msgid "Download Object"
-#~ msgstr "Object Downloaden"
-
-#~ msgid "Download Object..."
-#~ msgstr "Object Downloaden..."
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Download primitieven met verwijzingen naar een van de geselecteerde "
-#~ "primitieven"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "De gekopieerde data bevat onvolledige primitieven. Bij het plakken "
-#~ "hiervan worden de onvolledige primitieven verwijderd. Wilt u deze data "
-#~ "toch plakken zonder de onvolledige primitieven?"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Ongeldige ID opgegeven. Het object kan niet worden gedownload."
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Kon plugin {0} niet laden want de plugin zijn<br>main class ''{1}'' "
-#~ "was niet gevonden.<br>Hem wissen uit de instellingen?"
-
-#~ msgid "white"
-#~ msgstr "wit"
-
-#~ msgid "blue"
-#~ msgstr "blauw"
-
-#~ msgid "red"
-#~ msgstr "rood"
-
-#~ msgid "gray"
-#~ msgstr "grijs"
-
-#~ msgid "brown"
-#~ msgstr "bruin"
-
-#~ msgid "black"
-#~ msgstr "zwart"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "zware_hooggebergtetrektocht"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "moeilijke_hooggebergtetrektocht"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "bergtrektocht"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "zware_bergtrektocht"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "hooggebergtetrektocht"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Volledig scherm gebruiken"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Gelieve minimaal 2 knooppunten te selecteren, ofwel een node die dicht "
-#~ "bij een andere ligt, om deze samen te voegen."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Het was niet mogelijk om de opgegeven link of ID naar de geselecteerde "
-#~ "dienst te gebruiken. Gelieve opnieuw te proberen."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Laag ''{0}'' heeft reeds een conflict voor primitief<br>''{1}''."
-#~ "<br>Dit conflict kan niet worden toegevoegd.</html>"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Object \"{0}\" lokaal verwijderd zonder effect op de server"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Verwijzing wordt uit relatie {0} verwijderd"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Waarschuwing: Weg {0} wordt lokaal verwijderd, omdat het aantal "
-#~ "knooppunten lager werd dan 2. Huidig is {1}"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Maak verwijdering ongedaan voor {0} primitief"
-#~ msgstr[1] "Maak verwijdering ongedaan voor {0} primitieven"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Een object van type {0} met id {1} werd gemarkeerd om verwijderd te "
-#~ "worden, maar het maakt geen deel uit van de brondataset"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Ernstig conflict in het  'zichtbare' attribuut voor object van type {0} "
-#~ "met id {1} (versienummer is gelijk, maar attributen komen niet overeen)"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Deze test kijkt na of er wegen zijn met dezelfde tags en waarvan de "
-#~ "knooppuntn op dezelfde coördinaten liggen."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Deze test vindt meertalige objecten waarvan het naam-attribuut niet "
-#~ "gelijk  is aan een 'name:*'-attribuut of geen samenstelling is van "
-#~ "meerdere 'name:*' attributen, e.g., Italia - Italien - Italy."
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Het lijkt erop dat JOSM de vorige keer niet correct werd afgesloten. "
-#~ "Wenst u de gegevens te herstellen?"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Samenvoegen van verwijderde primitieven is mislukt"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "De hiernavolgende primitieven kunnen niet naar de "
-#~ "doelprimitief<br>aangezien ze werden verwijderd in de doeldataset:"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "De coördinaten voor het nieuwe knooppunt opgeven.<br/>U kan de "
-#~ "lengtegraad en breedtegraad scheiden met een spatie, komma of puntkomma."
-#~ "<br/>Gebruik positieve getallen of N-, E-karakters om Noord- of "
-#~ "Oostrichting aan te geven.<br/>Voor Zuid- en Westrichting kan u negatieve "
-#~ "getallen gebruiken of S, W-karakters.<br/>Coördinaatswaarde kan worden "
-#~ "opgegeven op drie manieren:<ul><li><i>graden</i><tt>&deg;</tt></"
-#~ "li><li><i>graden</i><tt>&deg;</tt> <i>minuten</i><tt>&#39;</tt></"
-#~ "li><li><i>graden</i><tt>&deg;</tt> <i>minuten</i><tt>&#39;</tt> "
-#~ "<i>seconden</i><tt>&quot</tt></li></ul>Symbolen <tt>&deg;</tt>, <tt>&#39;"
-#~ "</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> are optional."
-#~ "<br/><br/>Wat voorbeelden:<ul><li>49.29918&deg; 19.24788&deg;</li><li>N "
-#~ "49.29918 E 19.24788</li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</"
-#~ "li><li>N 49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 "
-#~ "N, 19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Selecteer primitieven die werden bijgedragen door deze gebruiker"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Historiek van de geselecteerde primitieven afhalen en tonen"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr ""
-#~ "Inzoomen naar de overeenstemmende primitieven in de huidige datalaag"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Zoom in naar de primitieven in de inhoud van deze wijzigingenverzameling "
-#~ "in de huidige datalaag"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Open browservenster met wikihulp voor het geselecteerde object"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>De kindrelatie<br>{0}<br>werd verwijderd op de server. Ze kan niet "
-#~ "geladen worden."
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Verwijder alle leden die naar één van de geselecteerde primitieven "
-#~ "verwijzen"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Meerdere leden die naar dezelfde primitief verwijzen"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Deze relatie bevat al één of meerdere leden die verwijzen naar "
-#~ "<br>de primitief ''{0}''<br><br>Wenst u deze werkelijk nogmaals toe te "
-#~ "voegen aan de relatie?</html>"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Voeg alle primitieven die geselecteerd werden in de huidige "
-#~ "gegevensverzameling toe vóór het eerste geselecteerde lid"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Voeg alle primitieven die geselecteerd werden in de huidige "
-#~ "gegevensverzameling toe achter het laatste geselecteerde lid"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Voeg alle primitieven die geselecteerd werden in de huidige "
-#~ "gegevensverzameling toe vóór het eerste lid"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Voeg alle primitieven die geselecteerd werden in de huidige "
-#~ "gegevensverzameling toe achter het laatste lid"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Selecteer relatieleden die verwijzen naar primitieven in de huidige "
-#~ "selectie"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Selecteer relatieleden die verwijzen naar {0} primitieven in de huidige "
-#~ "selectie"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Laag ''{0}'' heeft al een conflict voor primitief<br>''{1}''."
-#~ "<br>Gelieve eerst dit \r\n"
-#~ "conflict op te lossen en dan opnieuw te proberen.</html>"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr ""
-#~ "Dit  is gelijk aan het verwijderen van de rollen van deze primitieven."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Klik om het momenteel geselecteerde gebied af te halen"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Noch <strong>{0}</strong> noch <strong>{1}</strong> is ingeschakeld."
-#~ "<br>Gelieve te kiezen om ofwel OSM-gegevens, ofwel GPX-gegevens, ofwel "
-#~ "beide af te halen.</html>"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Hulpinhoud voor hulpthema ontbreekt</"
-#~ "p><p class=\"warning-body\">Hulpinhoud voor hulpthema <strong>{0}</"
-#~ "strong> is nog niet beschikbaar. Het ontbreekt in uw eigen taal ({1}) en "
-#~ "in het Engels.<br><br>Gelieve uw steentje bij te dragen om het JOSM "
-#~ "hulpsysteem te verbeteren en vul de ontbrekende informatie in. U kan het  "
-#~ "<a href=\"{2}\">hulpthema in uw eigen taal ({1})</a> en het <a href="
-#~ "\"{3}\">hulpthema in het Engels verbeteren.</a>.</p></html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "WAARSCHUWING: de API basis-URL heeft een ongeldig formaat. Doorklikken "
-#~ "naar een informatie- of geschiedenispagina met info over OSM-primitieven "
-#~ "zal waarschijnlijk mislukken. De API-basis-URL staat ingesteld op: ''{0}''"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Omschakelen tussen volledig schermmodus/venstermodus"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Voeg de momenteel geselecteerde primitieven toe in een andere laag"
+#~ "Waarschuwing: uitzondering wordt genegeerd omdat de taak werd afgebroken. "
+#~ "Uitzondering was: {0}"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Verdachte data gevonden. Toch versturen?"
+
+#~ msgid "Changeset"
+#~ msgstr "Wijzigingenset"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 26529)
+++ applications/editors/josm/i18n/po/pl.po	(revision 26530)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-28 10:43+0000\n"
-"Last-Translator: Rafał <rrudzik@gmail.com>\n"
+"Last-Translator: Rafał Rudzik <rrudzik@gmail.com>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "Language: pl\n"
@@ -18,6 +18,6 @@
 "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: 2011-07-31 11:47+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:38+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
@@ -26,5 +26,5 @@
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -39,12 +39,12 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL do pliku: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -81,10 +81,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -99,6 +99,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -122,14 +123,14 @@
 msgstr "Uwaga"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametr \"downloadgsp\" nie przyjmuje nazw plików lub adresów URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -142,13 +143,13 @@
 "JOSM (Kompatybilnych z Java 5).</li></ul>Więcej informacji:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Zamknij JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Kontynuuj mimo to"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -168,7 +169,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -178,6 +179,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -208,5 +209,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -393,6 +394,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -419,5 +420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -425,7 +426,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -433,5 +435,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -642,5 +644,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -892,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -899,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1087,6 +1089,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1237,5 +1239,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1458,6 +1460,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2116,5 +2118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2429,7 +2431,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr ""
@@ -2682,6 +2684,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2823,10 +2825,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2988,5 +2990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3557,6 +3559,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Znaleziono podejrzane dane. Przesłać mimo to?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3607,40 +3609,40 @@
 msgstr "Zmieniono węzły {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Usunięto  \"{0}\" w węźle ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Usunięto \"{0}\" w drodze ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Usunięto \"{0}\" w relacji ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Ustawiono {0}={1} dla węzła \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Ustawiono {0}={1} dla drogi \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Ustawiono {0}={1} dla relacji \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Usunięto \"{0}\" w {1} obiektach"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3767,4 +3769,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Potwierdź usunięcie."
@@ -4081,9 +4084,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Ostrzeżenie: Nie można zainicjować ustawień. Nie udało się przywrócić pliku "
-"ustawień domyślnych: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4119,5 +4120,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4221,10 +4222,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"Program JOSM spodziewał się znaleźć element [{0} {1}] w zestawie danych, ale "
-"go nie znalazł. Prosimy o raport na http://josm.openstreetmap.de . To nie "
-"jest krytyczny błąd i powinien być bezpieczny dla kontynuowania pracy."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4326,5 +4324,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4344,8 +4342,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4485,50 +4483,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "odwzorowanie Lamberta (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "odwzorowanie Merkatora"
@@ -4553,80 +4565,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Strefa PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Strefa {0} (Polska)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Strefa UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Północ"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Południe"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Półkula"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Przesunięcie o 3.000.000m na wschód"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4851,45 +4883,45 @@
 msgstr "Ten test sprawdza czy multipolygony są poprawne"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Niezamknięty obszar"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Brak zewnętrznej drogi multipolygonu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Brak stylu dla multipolygonu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Brak stylu dla relacji multipolygonu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Nieprzydatna rola członka multipolygonu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Obiekt niebędący drogą w multipolygonie"
@@ -5157,5 +5189,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5180,5 +5212,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5189,5 +5221,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5594,5 +5626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5658,5 +5690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "droga"
@@ -5664,5 +5696,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5670,10 +5702,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "szlak wodny"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "zagospodarowanie przestrzenne"
@@ -5683,5 +5715,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5696,5 +5728,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5708,5 +5740,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6059,5 +6091,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6166,4 +6198,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6269,5 +6302,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6312,11 +6345,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Możesz też podać <strong>adres kafelka</strong> dla pojedyńczego "
-"kafelka <i>powiększenie/x/y</i>, np. <i>15/256/223</i>. Adresy kafelków w "
-"formacie <i>powiększenie,x,y</i> lub <i>powiększenie;x;y</i> są również "
-"obsługiwane.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6602,9 +6631,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista połączonych elementów. Zastąpią one moje elementy kiedy zostanie "
-"zastosowana decyzja o połączeniu."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6838,10 +6865,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Zachowaj moje współrzędne"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Zachowaj ich współrzędne"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6897,6 +6924,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6918,6 +6945,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7315,5 +7342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7550,5 +7577,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7762,7 +7789,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "nieznany"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8026,5 +8083,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8044,5 +8101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8059,5 +8116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Pobierz niekompletnych członków zaznaczonych relacji"
@@ -8065,5 +8122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Pobierz niekompletnych członków"
@@ -8106,5 +8163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8112,5 +8169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8304,5 +8361,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8406,5 +8463,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Użytkownik"
@@ -9405,5 +9461,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9585,5 +9641,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9733,4 +9789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Tylko własne zestawy zmian"
@@ -9743,4 +9800,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Tylko zestawy zmian użytkownika o następującej nazwie użytkownika"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10012,9 +10075,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10024,13 +10087,13 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Pusta wartość usunie znacznik."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10043,18 +10106,19 @@
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Zmienić wartości?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10063,5 +10127,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10072,5 +10136,5 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10080,27 +10144,31 @@
 msgstr[2] "Zmiana zostanie zastosowana do {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Zaznacz obiekty, których właściwości chcesz zmienić."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Właściwości/członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Otwiera właściwości zaznaczonego obiektu"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10109,62 +10177,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Pozycja"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10228,8 +10296,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10252,5 +10322,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10590,9 +10660,4 @@
 msgstr "Wystąpił/o {0} koflikt/ów podczas importu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10632,10 +10697,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10916,37 +10975,4 @@
 msgstr "Rodzaj"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "nieznany"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11065,20 +11091,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Historia węzła {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historia drogi {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Historia relacji {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Ponownie wczytuje historię z serwera"
@@ -11170,6 +11196,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Zestaw zmian"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11711,8 +11737,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12143,4 +12169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12166,11 +12193,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12253,38 +12273,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Dostosuj kolor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Domyślny"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Wybierz kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nazwa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12296,9 +12316,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12306,26 +12326,26 @@
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Zakres czasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Długość"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Długość: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12335,8 +12355,8 @@
 msgstr[2] "{0} tras, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12346,12 +12366,12 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "punkt GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12361,10 +12381,10 @@
 msgstr[2] "{0} śladów, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12372,78 +12392,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "tylko punkty"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "ścieżka i punkty"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12454,6 +12474,6 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -12461,6 +12481,6 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12468,6 +12488,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12475,27 +12495,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Znaczniki nazwanych punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nazwane punkty GPS z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importuj dźwięk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12508,29 +12528,29 @@
 "nimi dźwięku.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import nie jest możliwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Pliki audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Markery audio z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importuj obrazki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12638,5 +12658,5 @@
 msgstr "Znaleziono następujące problemy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12646,57 +12666,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Automatyczne ładowanie kafelek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Ładuj kafelek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Pokaż informację kafelka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Ładuj wszystkie kafelki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Powiększ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Zmniejsz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Dopasuj do wielkości kafelek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Wyczyść cache kafelek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "przybliż by załadować kafelki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "przybliż by załadować więcej kafelek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "przybliż by zobaczyć więcej detali"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "Brak kafalek na tym poziomie przybliżenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13225,10 +13253,10 @@
 msgstr "Pliki JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "znacznik GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13237,5 +13265,5 @@
 msgstr[2] "znaczników"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13245,26 +13273,26 @@
 msgstr[2] "{0} składa się z {1} markerów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Zmienia widoczność markerów tekstowych i ikon."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synchronizacja dźwięku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Musisz włączyć pauzę kiedy usłyszysz wskazówkę do synchronizacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13272,14 +13300,14 @@
 msgstr "Dźwięk zsynchronizowany w punkcie {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Nie można zsynchronizować aktualnie odtwarzanej warstwy."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13303,13 +13331,13 @@
 msgstr "Nie można utworzyć nowego znacznika dźwiękowego."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Wystąpił błąd podczas próby wyświetlenia adresu URL dla tego znacznika"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(Adres URL był: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Błąd podczas wyświetlania adresu"
@@ -14254,73 +14282,73 @@
 msgstr "Kolory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Rysuj strzałki kierunkowe"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Tylko na początku drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Rysuj strzałki dla ulic jednokierunkowych"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Numeruj kolejne segmenty dróg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Rysuj granicę obszaru pobranych danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Rysuj tylko kontury obszarów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Punkty GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Rysuje strzałki kierunkowe dla segmentów drogi."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rysuje kolejne numery wszystkich segmentów drogi."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Stosuje antialiasing dla widoku mapy dając gładszy wygląd."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14329,9 +14357,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zaznacza nieaktywne warstwy danych innym kolorem."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14339,15 +14367,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Dane OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automatycznie"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Nazwa"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Opis"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "żadne"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Użyj ustawień globalnych."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14358,47 +14422,39 @@
 msgstr "wszystkie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "pliki lokalne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "żadne"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Wymuszaj rysowanie linii jeżeli nie zaimportowano odcinków."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Rysuj duże punkty GPS."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Rysuj okręgi na podstawie wartości HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Prędkość (czerwony = wolno, zielony = szybko)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jeden kolor (moze być zmieniony dla nazwanej warstwy)"
@@ -14406,5 +14462,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14428,5 +14484,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14469,5 +14525,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14481,38 +14537,18 @@
 msgstr "Ruch pieszy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Twórz znaczniki podczas czytania GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automatycznie"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Nazwa"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Opis"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Obie"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14523,10 +14559,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Rysuj linie pomiędzy punktami GPS"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14536,10 +14572,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maksymalna długość dla plików lokalnych (w metrach)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14548,10 +14584,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maksymalna długość (w metrach)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14560,10 +14596,10 @@
 "liniach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14572,5 +14608,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14578,14 +14614,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Rysuj większe kropki dla punktów GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14593,13 +14629,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14607,28 +14643,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Kolorowanie ścieżek i punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Etykietowanie punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15298,5 +15352,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15388,5 +15442,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Resetuj"
@@ -15665,6 +15719,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Zawsze aktualizuj bez pytania"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16060,5 +16114,5 @@
 msgstr "Nowa relacja"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16087,9 +16141,9 @@
 msgstr "Szukaj w szablonach"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Szukaj w tagach"
@@ -16369,6 +16423,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16691,5 +16745,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16903,5 +16957,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17296,4 +17350,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18123,4 +18182,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18240,4 +18301,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18801,5 +18876,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35106,4 +35181,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35120,6 +35196,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35138,15 +35214,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "skrótowa nazwa ulicy"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "etykieta \"jednokierunkowa\" na węźle"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "etykieta \"most\" na węźle"
@@ -35157,12 +35233,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "Błędny znacznik highway na węźle"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Nienazwana niesklasyfikowana droga"
@@ -35171,16 +35247,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "Droga bez numeru referencyjnego"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "Tymczasowy typ drogi"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "błędnie wpisana nazwa klucza"
@@ -35190,10 +35266,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr ""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -35202,10 +35278,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr ""
@@ -35214,34 +35290,43 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr ""
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr ""
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "nazwa ulicy zawiera ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "Relacja bez typu"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restauracja bez nazwy"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
 msgstr ""
 
@@ -35347,117 +35432,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czechy CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czechy UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Mapy NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japonia (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japonia (ORTO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japonia (ORTO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japonia (ORTO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Włochy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sycylia - Włochy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Włochy"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Francja)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35702,5 +35797,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr ""
 
@@ -35803,9 +35898,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35823,23 +35918,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35847,26 +35972,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informacje o wtyczce"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35874,5 +36027,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35983,9 +36136,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36084,17 +36237,34 @@
 msgstr "Zaznacza wszystkie adresy z niekompletnymi danymi."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36725,28 +36895,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36864,7 +37041,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37745,5 +37922,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37753,17 +37930,17 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Wybierz opcje rysowania linii"
@@ -37915,5 +38092,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37921,10 +38098,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37933,5 +38110,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37940,6 +38117,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37948,9 +38125,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38109,71 +38286,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38181,32 +38366,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38241,6 +38420,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38371,30 +38550,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39080,5 +39272,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39095,5 +39287,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39827,17 +40019,17 @@
 msgstr "Nowa warstwa ze schowka"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Nowa warstwa z pliku"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39851,36 +40043,32 @@
 msgstr "Dane w schowku nie są obrazem"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40502,5 +40690,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41468,4 +41656,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41685,6 +41890,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41931,6 +42136,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Otwiera okno edycji dla wybranego ograniczenia skrętu"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -42503,5 +42708,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42887,1987 +43092,70 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "File could not be found."
-#~ msgstr "Plik nie został odnaleziony."
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Nieznane rozszerzenie pliku."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Load Selection"
-#~ msgstr "Załaduj zaznaczenie"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakt {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "Pobieranie..."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Usuń zaznaczoną warstwę."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Rozwiąż konflikty"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punkt"
-#~ msgstr[1] "punkty"
-#~ msgstr[2] "punktów"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} usuniętych.)"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punkt"
-#~ msgstr[1] "{0} punkty"
-#~ msgstr[2] "{0} punktów"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Niezapisane zmiany"
-
-#~ msgid "OSM password"
-#~ msgstr "Hasło OSM"
-
-#~ msgid "Unknown version"
-#~ msgstr "Nieznana wersja"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Niedozwolony obiekt z id=0"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Przygotowywanie danych..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
-
-#~ msgid "to"
-#~ msgstr "do"
-
-#~ msgid "true"
-#~ msgstr "prawda"
-
-#~ msgid "false"
-#~ msgstr "fałsz"
-
-#~ msgid "Change"
-#~ msgstr "Zmień"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach"
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchronizuj zegar"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Jeszcze nie zaimplementowane."
-
-#~ msgid "Do not show again"
-#~ msgstr "Nie pokazuj ponownie"
+#~ msgid "Change values?"
+#~ msgstr "Zmienić wartości?"
 
 #~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "W programie wystąpił nieoczekiwany błąd.\n"
-#~ "\n"
-#~ "Taki błąd jest zawsze błędem programisty. Jeżeli korzystasz\n"
-#~ "z najnowszej wersji JOSM, rozważ proszę możliwość zgłoszenia błędu."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Błąd podczas przetwarzania"
-
-#~ msgid "layer not in list."
-#~ msgstr "warstwa nie jest na liście."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "obraz"
-#~ msgstr[1] "obrazy"
-#~ msgstr[2] "obrazów"
-
-#~ msgid "Timespan: "
-#~ msgstr "Okres czasu: "
-
-#~ msgid "Length: "
-#~ msgstr "Długość: "
-
-#~ msgid "name"
-#~ msgstr "nazwa"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "trasa z {0} punktem"
-#~ msgstr[1] "trasa z {0} punktami"
-#~ msgstr[2] "trasa z {0} punktami"
-
-#~ msgid "my version:"
-#~ msgstr "moja wersja:"
-
-#~ msgid "their version:"
-#~ msgstr "ich wersja:"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nie można połączyć się z serwerem."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Odczytania zakładek niemożliwe."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Zapisanie zakładek niemożliwe."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Źródła i rodzaje danych"
-
-#~ msgid "Download Area"
-#~ msgstr "Pobierany obszar"
-
-#~ msgid "zoom level"
-#~ msgstr "powiększenie"
-
-#~ msgid "x from"
-#~ msgstr "x - od"
-
-#~ msgid "y from"
-#~ msgstr "y - od"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Proszę podać nazwę lokalizacji."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Adres URL serwera"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Użytkownik OSM (email)"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Używaj serwera proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonimowy"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Ustawienia Proxy"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxy - adres serwera"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxy - port serwera"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Proxy - nazwa użytkownika"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Proxy - hasło"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Pozostawiaj kopie zapasowe plików"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Wersja {1}{2}"
+#~ "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM."
 
 #~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Czy pobrać następujące wtyczki?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Pobierz brakujące wtyczki"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Nawiązywanie połączenia z serwerem OSM..."
-
-#~ msgid "position"
-#~ msgstr "pozycja"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Usuń {1} {0}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Usuń {0} {1}"
+#~ "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Uwaga - zażądano załadowania wtyczki {0}. Ta wtyczka nie jest już jednak "
-#~ "potrzebna."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Nie znaleziono wtyczki: {0}."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Wysyła wszystkie zmiany na serwer OSM."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Czy wysłać te zmiany?"
-
-#~ msgid "Uploading data"
-#~ msgstr "Przesyłanie danych"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Nie można zmienić nazwy pliku \"{0}\""
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
-
-#~ msgid "gps track description"
-#~ msgstr "Opis trasy GPS"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Otwiera okno ustawień programu."
-
-#~ msgid "Jump forward"
-#~ msgstr "Przeskakuje do następnego fragmentu."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Zmniejsza prędkość odtwarzania."
-
-#~ msgid "Jump back."
-#~ msgstr "Wraca do wcześniej odtwarzanego fragmentu."
-
-#~ msgid "Faster Forward"
-#~ msgstr "Zwiększa prędkość odtwarzania."
-
-#~ msgid "Next Marker"
-#~ msgstr "Następny znacznik"
-
-#~ msgid "Play next marker."
-#~ msgstr "Odtwórz następny znacznik."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Poprzedni znacznik"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Odtwórz poprzedni znacznik."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Wybieranie, przesuwanie i obracanie obiektów"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Brak argumentów dla operator lub."
-
-#~ msgid "near"
-#~ msgstr "niedaleko"
-
-#~ msgid "zoom"
-#~ msgstr "powiększenie"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Napraw zaznaczone błędy."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignoruj wybrane błędy następnym razem."
-
-#~ msgid "osmarender options"
-#~ msgstr "opcje osmarender"
-
-#~ msgid "start"
-#~ msgstr "początek"
-
-#~ msgid "end"
-#~ msgstr "koniec"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Mapa \"Slippy\""
-
-#~ msgid "Goods"
-#~ msgstr "Zaopatrzenie"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorówka"
-
-#~ msgid "Boat"
-#~ msgstr "Łódka"
-
-#~ msgid "Bridleway"
-#~ msgstr "ścieżka do jazdy konnej"
-
-#~ msgid "Cycleway"
-#~ msgstr "ścieżka rowerowa"
-
-#~ msgid "Footway"
-#~ msgstr "droga dla pieszych"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "droga gruntowa klasy 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "droga gruntowa klasy 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "droga gruntowa klasy 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "droga gruntowa klasy 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "droga gruntowa klasy 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Edycja szlaku"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "szlak górski"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Edycja szlaku górskiego"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "stromy szlak górski"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "miejsce do zawracania"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "szlak alpejski"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Edycja szlaku alpejskiego"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Punkty drogi wodnej"
-
-#~ msgid "Station"
-#~ msgstr "stacja"
-
-#~ msgid "Shop"
-#~ msgstr "warsztat"
-
-#~ msgid "Edit Station"
-#~ msgstr "Edycja stacji"
-
-#~ msgid "Accomodation"
-#~ msgstr "Zakwaterowanie"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Motor Sports"
-#~ msgstr "sporty motorowe"
-
-#~ msgid "Football"
-#~ msgstr "football"
-
-#~ msgid "Rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Edycja miejsca do gry w rugby"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianizm"
-
-#~ msgid "Charge"
-#~ msgstr "Opłata"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Ustawienia wtyczki WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "Adres serwera WMS"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Wpisz nazwę pozycji w menu oraz adres serwera WMS"
-
-#~ msgid "help"
-#~ msgstr "pomoc"
-
-#~ msgid "Help / About"
-#~ msgstr "Pomoc / Informacje"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Pomoc wtyczki WMS"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "No data imported."
-#~ msgstr "Nie zaimportowano danych."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Błąd w czasie ładowania strony {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otwórz w przeglądarce"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Pomoc JOSM w sieci"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Wybierz najpierw zakładkę."
+#~ "<html>Możesz też podać <strong>adres kafelka</strong> dla pojedyńczego "
+#~ "kafelka <i>powiększenie/x/y</i>, np. <i>15/256/223</i>. Adresy kafelków w "
+#~ "formacie <i>powiększenie,x,y</i> lub <i>powiększenie;x;y</i> są również "
+#~ "obsługiwane.</html>"
 
 #~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Maksymalna długość (w metrach) rysowanych linii. Ustaw '-1' aby zawsze "
-#~ "rysować linie."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktywacja zaktualizowanych wtyczek"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Sprzeczne relacje"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Wybrane węzły nie tworzą okręgu."
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
+#~ "Program JOSM spodziewał się znaleźć element [{0} {1}] w zestawie danych, "
+#~ "ale go nie znalazł. Prosimy o raport na http://josm.openstreetmap.de . To "
+#~ "nie jest krytyczny błąd i powinien być bezpieczny dla kontynuowania pracy."
 
 #~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Wtyczka nie może zostać usunięta. Proszę przekaż informacje o tym "
-#~ "problemie autorom JOSM."
-
-#~ msgid "Error during parse."
-#~ msgstr "Błąd parsowania danych"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Brak wymaganego atrybutu \"{0}\"."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):"
-
-#~ msgid "Aborting..."
-#~ msgstr "Przerywanie..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Wprowadź hasło"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin wymaga aktualizacji JOSM: {0}."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> nie posiada referencji"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Proszę zgłosić bład pod adresem {0}"
-
-#~ msgid "Preparing..."
-#~ msgstr "Przygotowywanie..."
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Ustawienie wartości na pustą usuwa klucz"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Modyfikuj relację #{0}"
-
-#~ msgid "Add Selected"
-#~ msgstr "Dodaj zaznaczone"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Na pewno usunąć całą warstwę?"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Członkowie: {0}"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Ilość przewodów"
+#~ "Lista połączonych elementów. Zastąpią one moje elementy kiedy zostanie "
+#~ "zastosowana decyzja o połączeniu."
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Zawsze aktualizuj bez pytania"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Otwiera okno edycji dla wybranego ograniczenia skrętu"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Zachowaj ich współrzędne"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Zachowaj moje współrzędne"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Postaraj się zaintalować najnowszą wersję tej wtyczki przed zgłaszaniem "
-#~ "błędu."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Znaleziono tag <member> w"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>UWAGA: Hasło jest zapisywane otwartym tekstem w pliku ustawień."
-#~ "<br>Hasło jest przesyłane otwartym tekstem podczas połączenia z serwerem "
-#~ "i jest częścią adresu.<br><b>Nie należy używać żadnych wartościowych "
-#~ "haseł</b></html>"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Nie można odczytać \"{0}\""
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Wyślij do OSM..."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Dołącz instrukcje (dokładne i krok po kroku) w jaki sposób można "
-#~ "odtworzyć błędną sytuację."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Upewnij się, żeby załączyć następujące informacje:"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Serwer zgłosił błąd wewnętrzny. Spróbuj zmniejszyć obszar lub spróbować "
-#~ "po chwili."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Zły format identyfikatora węzła"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Serwer nie wspiera wersjonowania"
-
-#~ msgid "Uploading..."
-#~ msgstr "Wysyłanie..."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Zmiany nie zostały zapisane. Odrzucić je?"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
-#~ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Błąd podczas parsowania odpowiedzi serwera."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Wystąpiły konfikty podczas importowania."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Wystąpiły problemy z następującymi wtyczkami:\n"
-#~ " {0}"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Wtyczka {0} wydaje siębyć zepsuta lub nie można było jej pobrać "
-#~ "automatycznie."
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Nie można połączyć z serwerem OSM. Proszę sprawdzić swoje połączenie z "
-#~ "Internetem."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Otwieranie zestawu zmian..."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Nie można pobrać wtyczki {0} z {1}"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Błąd: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Uwaga: {0}"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Odwzorowanie \"{0}\" jest zaprojektowany\n"
-#~ "dla szerokości geograficznych między 46.1° a 57°.\n"
-#~ "Proszę użyć innego odwzorowania jeśli\n"
-#~ "nie korzystasz z francuskiego serwera WMS.\n"
-#~ "Proszę nie wysyłać żadnych danych po tej wiadomości."
-
-#~ msgid "Rotate"
-#~ msgstr "Obrót"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "W"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Import NMEA zakończony niepowodzeniem!"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Most zwodzony"
-
-#~ msgid "Grid"
-#~ msgstr "Siatka"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchronizuj czas z urządzeniem GPS"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Nieznana rola \"{0}\"."
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Nieznane sewkencje: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Błędy sum kontrolnych: "
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Rozmnóż {0} wezłów w {1} węzłów"
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Wystąpił błąd podczas zapisywania."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Nie można utworzyć kopii zapasowej pliku."
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Błąd przetwarzania adresu URL: \"{0}\""
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Zaznaczenie musi składać się wyłącznie z dróg."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Dozwolone są tylko dwa węzły"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Wybrano tylko jeden węzeł"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Podaj współrzędne nowego węzła."
-
-#~ msgid "File not found"
-#~ msgstr "Plik nie został odnaleziony"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Proszę wcześniej podać wybrane współrzędne."
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Błąd podczas usuwania wtyczki: {0}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Aktualizuj następujące wtyczki:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikty: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Warstwy: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autorzy: {0}"
-
-#~ msgid "Download List"
-#~ msgstr "Pobierz listę"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Wtyczka już istnieje"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}."
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Błąd podczas wczytywania pliku informacyjnego wtyczki: {0}"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Wszystkie zainstalowane wtyczki są aktualne."
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM."
-#~ msgstr[1] ""
-#~ "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM."
-#~ msgstr[2] ""
-#~ "{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM."
-
-#~ msgid "No plugin information found."
-#~ msgstr "Nie znaleziono informacji o wtyczce."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Archiwum z wtyczką już istnieje. Czy na pewno pobrać aktualną wersję "
-#~ "kasując istniejące archiwum?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Aktywacja zaktualizowanych wtyczek nie powiodła się. Sprawdź czy JOSM ma "
-#~ "uprawnienia aby nadpisać istniejące pliki."
-
-#~ msgid "Commit comment"
-#~ msgstr "Komentarz zmiany"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} pozostało. Przesyłanie {4}: {5} (id: {6})"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr ""
-#~ "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników."
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Porzuć zmiany"
-
-#~ msgid "different"
-#~ msgstr "różne"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stopnie minuty sekundy"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Usuń \"{0}\" dla {1} ''{2}''"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Usuń \"{0}\" dla {1} {2}"
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdziel segmenty drogi"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Czy scalić węzły z różnych relacji?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Nie można scalić węzłów - wymagałoby to usunięcia drogi która jest nadal "
-#~ "używana."
-
-#~ msgid "History of Element"
-#~ msgstr "Historia elementu"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Wyświetla historyczne informacje na temat dróg i węzłów OSM."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Brak argumentu dla operatora nie."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Brak nawiasu zamykającego."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' gdziekolwiek w nazwie"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - brak 'Bak' w nazwie"
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - obiekt z podanym ID"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - obiekt z podaną liczbą węzłów"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Niektóre z węzłów są (prawie) w jednej linii"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej "
-#~ "czterech węzłach."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Użyj stopni dziesiętnych."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Wartości ujemne oznaczają zachodnią/południową półkulę."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Wpisz proszę czego szukać"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
-
-#~ msgid "Set the language."
-#~ msgstr "Ustaw język"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} składa się z {1} ścieżki"
-#~ msgstr[1] "{0} składa się z {1} ścieżek"
-#~ msgstr[2] "{0} składa się z {1} ścieżek"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS początek: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS koniec: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "aktualne przesunięcie: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "różnica stref czasowych: "
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Podany czas nie został rozpoznany."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Adres URL serwera OSM (REST API)"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Login (adres email) konta OSM"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
-
-#~ msgid "Create new relation"
-#~ msgstr "Tworzy nową relację"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Edytuje nową relację"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Istnieją niezapisane zmiany. Czy usunąć tę warstwę mimo tego?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Włącz warstwę bezpośrednio poniżej w wybraną warstwę."
-
-#~ msgid "World"
-#~ msgstr "Świat"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "park_and_ride"
-#~ msgstr "parkuj i jedź"
-
-#~ msgid "citymap"
-#~ msgstr "mapa miasta"
-
-#~ msgid "hikingmap"
-#~ msgstr "mapa tras pieszych"
-
-#~ msgid "bicyclemap"
-#~ msgstr "mapa tras rowerowych"
-
-#~ msgid "intermedia"
-#~ msgstr "średnia"
-
-#~ msgid "advance"
-#~ msgstr "dla zaawansowanych"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Edycja sklepu z napojami"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Ustaw {0}={1} dla {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Ustaw {0}={1} dla {2} {3}"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Ten test sprawdza czy dwie drogi, tory lub szlaki wodne przecinają się na "
-#~ "tej samej warstwie ale nie są połączone węzłem."
-
-#~ msgid "Open User Page"
-#~ msgstr "Otwórz stronę użytkownika"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Otwiera stronę użytkownika w przeglądarce"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Wystąpił wyjątek"
-
-#~ msgid "Portcullis"
-#~ msgstr "brona"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Grupa szablonów \"{0}\""
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Pokaż/Ukryj Tekst/Ikony"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Odśwież listę zaznaczonych obiektów."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Historia poleceń: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Rozwiązywanie konflików."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' w dowolnym kluczu lub nazwie."
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr "Użyj <b>\"</b> aby wpisać operator (np.: jeżeli klucz zawiera :)"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Kliknij aby usunąć. Shift: usuwa segment. Alt: nie usuwa węzłów przy "
-#~ "usuwaniu drogi. Ctrl: usuwa powiązane obiekty."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Narysuj odcinek aby utworzyć prostokąt."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Wybierz proszę dokładnie trzy węzły lub jedną drogę z dokładnie trzema "
-#~ "węzłami."
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Nie można było utworzyć nowego problemu. Wynik: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr ""
-#~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
-
-#~ msgid "board"
-#~ msgstr "tablica informacyjna"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nie można odczytać wyników wyszukiwania z serwera."
-
-#~ msgid "optician"
-#~ msgstr "optyk"
-
-#~ msgid "Open an other photo"
-#~ msgstr "Otwórz inne zdjęcie"
-
-#~ msgid "No password provided."
-#~ msgstr "Nie podano hasła."
-
-#~ msgid "No username provided."
-#~ msgstr "Nie podano nazwy użytkownika."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Otwórz obrazy za pomocą AgPifoJ..."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotagowane obrazy"
-
-#~ msgid "Update position for: "
-#~ msgstr "Aktualizuj pozycję dla: "
-
-#~ msgid "Save and Exit"
-#~ msgstr "Zapisz i wyjdź"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Usuń wszystkie zaznaczone obiekty z relacji"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Usuń zaznaczone"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Usuń warstwę"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Obrazy dla {0}"
-
-#~ msgid "sports"
-#~ msgstr "Sklep sportowy"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Maks. wysokość (w metrach)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Maks. szerokość (w metrach)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Maks. długość (w metrach)"
-
-#~ msgid "Navigation"
-#~ msgstr "Nawigacja"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "URL WMS (domyślny)"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Pokaż panel autorów"
-
-#~ msgid "Please select some data"
-#~ msgstr "Proszę zaznaczyć jakieś dane"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Wybierz dane użytkownika"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Ślad GPX wczytany"
-
-#~ msgid "All images"
-#~ msgstr "Wszystkie obrazy"
-
-#~ msgid "Occupied By"
-#~ msgstr "Zajęte przez"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Edytor relacji: {0}"
-
-#~ msgid "Move Up"
-#~ msgstr "Przesuń w górę"
-
-#~ msgid "Move Down"
-#~ msgstr "Przesuń w dół"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Źródło szablonów"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Aktualizuj wtyczki"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Rozwiąż konflikt"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} wewnątrz ścieżki GPS."
-
-#~ msgid "Login"
-#~ msgstr "Logowanie"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Cofnij stan aktualnie zaznaczonych obiektów do wersji zaznaczonej w "
-#~ "liście historia poleceń."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Wczytaj GPX..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Edycja właściwości"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Edycja drogi gruntowej klasy 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Edycja drogi gruntowej klasy 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Edycja drogi gruntowej klasy 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Edycja drogi gruntowej klasy 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Edycja drogi gruntowej klasy 5"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "stromy szlak alpejski"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Edycja stromego szlaku alpejskiego"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "trudny szlak alpejski"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Edycja trudnego szlaku alpejskiego"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Edycja mostu zwodzonego"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Edycja brony"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Wszystkie trasy są puste"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Rozwiąż konflikty"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Pobrano informacje o wtyczkach z {0} serwera"
-#~ msgstr[1] "Pobrano informacje o wtyczkach z {0} serwerów"
-#~ msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Połącz mimo tego"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Podaj wartości dla wszystkich konfliktów."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
-#~ "lub <A HREF=\"{1}\">po polsku</A>."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
-#~ "przesłane elementy posiadają historię."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Scal mimo tego"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Nieprawidłowe sekwencje: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Zerowe współrzędne: "
-
-#~ msgid "Update Data"
-#~ msgstr "Zaktualizuj dane"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Podczas pobierania wystąpiły następujące błędy:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Błędy podczas pobierania"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "odwzorowanie Lamberta (Francja)"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} obiekt ma konflikt:"
-#~ msgstr[1] "{0} obiekty mają konflikt:"
-#~ msgstr[2] "{0} obiektów ma konflikt:"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- używasz wersji {0}"
-
-#~ msgid "Full Screen"
-#~ msgstr "Pełny ekran"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Przełącza widok na pełen ekran"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Pobierz wtyczki"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Usuń i pobierz"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Edycja lotniska"
-
-#~ msgid "Board Type"
-#~ msgstr "Rodzaj tablicy"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Nie znaleziono miejscowości {0} lub nie jest ona dostępna w WMS.\n"
-#~ "Proszę sprawdzić jej dostepność pod adresem www.gadastre.gouv.fr"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
-#~ "jakakolwiek warstwa danych?"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Ustawiono odwzorowanie EPSG:4326, które może powodować<br> "
-#~ "niepożądane wyniki przy wyrównywaniu do prostokąta.<br> Należy zmienić "
-#~ "rodzaj odwzorowania, aby wyłączyć to ostrzeżenie.<br> Czy kontynuować?"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
-#~ "conditions for no layer\"."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Nieprawidłowe odwzorowanie"
-
-#~ msgid "Uploading"
-#~ msgstr "Wysyłanie"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because the server has a newer "
-#~ "version of one<br>of your nodes, ways or relations.<br>The conflict is "
-#~ "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-#~ "server has version {2}, your version is {3}.<br>Please synchronize your "
-#~ "local dataset using <br><strong>File-&gt;Update Data</strong>, "
-#~ "resolve<br>any conflicts and try to upload again.</html>"
-#~ msgstr ""
-#~ "<html>Wysyłanie <strong>nie powiodło się</strong>, ponieważ na serwerze "
-#~ "znajduje się nowsza wersja jednego ze zmienionych lokalnie węzłów, dróg "
-#~ "lub relacji.<br>Konflikt wywołany jest przez <strong>{0}</strong> o "
-#~ "identyfikatorze <strong>{1}</strong>.<br>Na serwerze znajduje się wersja "
-#~ "{2} obiektu, twoja wersja to {3}.<br>Zsynchronizuj swoją kopię danych z "
-#~ "serwerem przy pomocy <strong>Plik-&gt;Zaktualizuj dane<strong>,<br> "
-#~ "rozwiąż wszystkie konflikty i spróbuj przesłać ponownie.</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "UWAGA: nieoczekiwany format bazowego URL API. Przekierowanie do "
-#~ "historycznej strony OSM prawdopodobnie zawiedzie. Bazowy URL API to: "
-#~ "\"{0}\""
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Aktualna ilość zmian przekracza maksymalną możliwą ilość. Aktualna ilość "
-#~ "zmian to {0} z możliwych {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Inicjalizacja API nie powiodła się."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
-#~ "<A HREF=\"{1}\">swoim języku</A>."
-
-#~ msgid "No data"
-#~ msgstr "Brak danych"
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizacja się nie powiodła"
-
-#~ msgid "Update Selection"
-#~ msgstr "Aktualizuj zaznaczenie"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Wykryto konflikt"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Załadunek do API OSM się nie udał."
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Załadunek się <strong>nie</strong> powiódł.<br>{0}</html>"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Zmień {0} {1}"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Błąd podczas łączenia z serwerem."
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Dodaj {0} {1}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikty podczas pobierania."
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Nie mogę czytać pliku ''{0}''. Komunikat błędu: <br>{1}</html>"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "niespodziewana wartość powrotna. Dostałem {0}"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parameter ''{0}'' nie może być pusty (null)"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "Załadunek wszystkich zmian w jednym żądaniu."
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "The following errors occurred during mass download:{0}"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Nie mogę szukać ponieważ nie załadowano danych."
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Przesunąłeś/ęłaś więcej niż {0} elementów.\n"
-#~ "Przesuwanie dużej liczby elementów jednocześnie jest zazwyczaj wynikiem "
-#~ "błędu.\n"
-#~ "na pewno tego chcesz?"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to "
-#~ "spowodowac problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą "
-#~ "używać tych węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parametr {0} nie może być wartością null"
-
-#~ msgid "standard"
-#~ msgstr "standardowy"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Nie można odczytać pliku ''{0}''.<br> Błąd: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Nie zapisano zmian na {0} warstwie. Porzucić zmiany i kontynuować?"
-#~ msgstr[1] ""
-#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
-#~ msgstr[2] ""
-#~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Przesuwaj obiekty przeciągając je; Shift aby dodać do wybranych (Ctrl aby "
-#~ "przełączać); Shift-Ctrl aby obrócić wybrane; albo zmień wybrane"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
-#~ "<A HREF=\"{1}\">swoim języku</A>."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> "
-#~ "lub <A HREF=\"{1}\">po polsku</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' nie może być pusty (null)"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "niespodziewana wartość powrotna. Dostałem {0}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Nie można odczytać \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Nie można połączyć z serwerem OSM. Proszę sprawdzić swoje połączenie z "
-#~ "Internetem."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Włącz wybrane elementy do innej warstwy"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Nie wybrano elementów do odświerzenia."
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Odświerzam wybrane elementy pobierając z serwera."
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Nie znalazłem elementu o id {0} w aktualnym zestawie danych"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Odświeżam element"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "usunięte, bądź przesunięte elementy"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Wybierz jeśli dane mają być załądowane do nowej warstwy"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Odświerz obiekty na aktualnej warstwie pobierając z serwera."
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Nie znalazłem obiektu o id {0} w zestawie danych."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Wyślij wszystkie zmiany w aktualnej warstwie do serwera OSM."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Powstały nierozwiązywalne automagicznie konflikty w warstwie "
-#~ "''{0}''.<br>Musisz je najpierw rozwiązać.</html>"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Wprowadź szerokość geograficzną z zakresu -90..90 stopni"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Wprowadź prawidłową długość geograficzną z zakresu -180..180 stopni"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Wprowadź prawidłową szerokość geograficzną z zakresu -90..90 stopni"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Wprowadź długość geograficzną z zakresu -180..180 stopni"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Zamknij okno i nie twórz nowego węzła"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Pełny ekran"
-
-#~ msgid "Closed Way"
-#~ msgstr "Droga zamknięta"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Nie można otworzyć katalogu.<br>Proszę wybrać plik!"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nie można cofnąć polecenia \"{0}\" ponieważ warstwa \"{1}\" nie istnieje"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parametr \"{0}\" nie może być pusty"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Ostrzeżenie: Nie można zainicjować ustawień. Katalog ustawień ''{0}'' nie "
-#~ "jest katalogiem."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html> Nie można zainicjować ustawień. <br>Katalog ustawień ''{0}'' nie "
-#~ "jest katalogiem.</html>"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Oczekiwano parametru \"{0}\" >0.0. Otrzymano {1}"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Oczekiwana długość tablicy 4. Otrzymano {0}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Oczekiwano ID >= 0. Jest {0}."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "UWAGA: nieznany format adresu URL API. Przekierowanie do strony "
-#~ "informacyjnej lub historii obiektu OSM najprawdopodobniej zakończy się "
-#~ "niepowodzeniem. Adres URL API to: \"{0}\""
-
-#~ msgid "Fix relations"
-#~ msgstr "Popraw relacje"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Przełącza na pełny ekran"
-
-#~ msgid "Travel"
-#~ msgstr "Podróż"
-
-#~ msgid "Download Object..."
-#~ msgstr "Pobierz obiekt…"
-
-#~ msgid "Download Object"
-#~ msgstr "Pobierz obiekt"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Można połączyć jednocześnie tylko dwa nakładające się obszary"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr ""
-#~ "\"{0}\" nie jest połączona i z tego powodu nie można połączyć obszarów"
-
-#~ msgid "Create a new map."
-#~ msgstr "Tworzy nową warstwę mapy"
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Filtr Ukryte: {0} Zablokowane: {0}"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Połączono nakładające się obszary"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Zastosuj także dla dzieci"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Wczytuje zapisaną kalinrację dla obrazu"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Pobiera kafelki WMS z {0}"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Zmodyfikuj listę serwerów WMS wyświetlanych w menu wtyczki WMS"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Kopiuj zaznaczony serwer do menu"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Przeciągnij segment drogi aby utworzyć prostokąt. Ctrl - przeciąganie "
-#~ "segmentów wzdłuż normalnej."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} konflikt pozostaje do rozwiązania.<br><br>Proszę otworzyć okno "
-#~ "Konfliktów aby rozwiązać go ręcznie."
-#~ msgstr[1] ""
-#~ "{0} konflikty pozostaje do rozwiązania.<br><br>Proszę otworzyć okno "
-#~ "Konfliktów aby rozwiązać je ręcznie."
-#~ msgstr[2] ""
-#~ "{0} konfliktów pozostaje do rozwiązania.<br><br>Proszę otworzyć okno "
-#~ "Konfliktów aby rozwiązać je ręcznie."
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "nie widoczne (na serwerze)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "widoczne (na serwerze)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Widoczne:"
-
-#~ msgid "Man-Made"
-#~ msgstr "Budowle"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Dane zawierają błędy. Przesłać mimo tego?"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Podaj ciąg do wyszukania."
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Podaj ciąg do przefiltrowania."
-
-#~ msgid "football"
-#~ msgstr "futbol amerykański"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Dostosowuje pozycję wybranej warstwy WMS"
-
-#~ msgid "Used style"
-#~ msgstr "Używany styl"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "D"
-
-#~ msgid "brown"
-#~ msgstr "brązowy"
-
-#~ msgid "black"
-#~ msgstr "czarny"
-
-#~ msgid "white"
-#~ msgstr "biały"
-
-#~ msgid "blue"
-#~ msgstr "niebieski"
-
-#~ msgid "red"
-#~ msgstr "czerwony"
-
-#~ msgid "gray"
-#~ msgstr "szary"
-
-#~ msgid "tower"
-#~ msgstr "wieża"
-
-#~ msgid "line"
-#~ msgstr "linia główna"
-
-#~ msgid "minor_line"
-#~ msgstr "linia boczna"
-
-#~ msgid "Amenities"
-#~ msgstr "Udogodnienia"
-
-#~ msgid "any substance"
-#~ msgstr "różne substancje"
-
-#~ msgid "underwater"
-#~ msgstr "podwodny"
-
-#~ msgid "overground"
-#~ msgstr "nadziemy"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Wprowadzono niepoprawne ID. Nie można pobrać obiektu."
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Połącz obszary: Usuń krótkie drogi"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Niewłaściwa kombinacja tag/wartość"
-
-#~ msgid "With kiosk"
-#~ msgstr "Kiosk"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Edycja sportów motorowych"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "do {0} elementu"
-#~ msgstr[1] "do {0} elementów"
-#~ msgstr[2] "do {0} elementów"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Dodaje wszystkie obecnie zaznaczone elementy za ostatnim zaznaczonym "
-#~ "członkiem"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Dodaje wszystkie obecnie zaznaczone elementy przed pierwszym zaznaczonym "
-#~ "członkiem"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Dodaje wszystkie obecnie zaznaczone elementy przed pierwszym członkiem"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr "Dodaje wszystkie obecnie zaznaczone elementy po ostatnim członku"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Zaznacza elementy dla wybranych członków relacji"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Wielokąt złożony musi sosiadać tylko zamknięte drogi."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Pozwala wysyłać innym aplikaciom polecenia do JOSM"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Tworzy wielokąty złożone jednym kliknięciem, łatwiej niż w standardowy "
-#~ "sposób z użyciem edytora relacji."
-
-#~ msgid "Active styles"
-#~ msgstr "Aktywne style"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Dostępne style (z {0})"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM znalazł {0} niezapisanych warstw danych. Wygląda na to, że program "
-#~ "ostatnio się zawiesił. Czy chcesz odtworzyć dane?"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Wyświetla georeferencyjne obrazy jako tło w JOSM (serwery WMS, "
-#~ "Yahoo, ...)."
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Warstwa WMS bez nazwy"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (lustro)"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Pobiera i pokazuje historię zaznaczonych elementów"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Powiększa odpowiadające elementy na edytowanej warstwie danych"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Powiększ elementy zawarte w tym zestawie zmian w edytowanej warstwie "
-#~ "danych"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Wygląda na to że JOSM zawiesił się ostatnim razem. Czy chcesz przywrócić "
-#~ "dane?"
-
-#~ msgid "Post Code"
-#~ msgstr "Kod pocztowy"
-
-#~ msgid "Guess address data"
-#~ msgstr "Odgadnij dane adresowe"
-
-#~ msgid "Guess street names"
-#~ msgstr "Odgadnij nazwę ulicy"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Proszę wybrać warstwę WMS do dostosowania."
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Wybierz warstwę WMS"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Brak obecnie wastwy WMS do dostosowania."
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Dostępne style (z {0}):"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Ustawienia wtyczki SlippyMap."
-
-#~ msgid "autozoom"
-#~ msgstr "automatyczne powiększenie"
-
-#~ msgid "autoload tiles"
-#~ msgstr "automatyczne wczytywanie kafelków"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Ta warstwa nie wspiera żadnego z odwzorowań JOSM,\n"
-#~ "więc nie może zostać użyta. Ta wiadomość nie wyświetli się ponownie."
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "ślad"
-#~ msgstr[1] "ślady"
-#~ msgstr[2] "śladów"
-
-#~ msgid "image "
-#~ msgstr "obraz "
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Optymalne przybliżenie: {0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Rozmiar piksela: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Obecnie przybliżenie: {0}"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Podaj swoją nazwę użytkownika oraz hasło. Hasło <strong>nie będzie</"
-#~ "strong> zapisane jako zwykły tekst w ustawieniach JOSM i zostanie wysłane "
-#~ "na serwer OSM <strong>tylko raz</strong>. Przy następnych przesyłaniach "
-#~ "danych twoje hasło nie będzie już używane."
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Poniżej znajduje się wyniki automatycznego sprawdzania danych. Postaraj "
-#~ "się je poprawić, jednak bądź ostrożny - możesz zepsuć poprawne dane."
-#~ "<br>Jeśli masz wątpliwości, zignoruj dany błąd. Po anulowaniu przesyłania "
-#~ "otworzy się panel sprawdzania poprawności ze znalezionymi błędami."
+#~ "Ostrzeżenie: Nie można zainicjować ustawień. Nie udało się przywrócić "
+#~ "pliku ustawień domyślnych: {0}"
+
+#~ msgid "Both"
+#~ msgstr "Obie"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Znaleziono podejrzane dane. Przesłać mimo to?"
+
+#~ msgid "Changeset"
+#~ msgstr "Zestaw zmian"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 26529)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 26530)
@@ -9,5 +9,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-19 16:38+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -18,10 +18,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:45+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:41+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -36,12 +36,12 @@
 msgstr "Ajuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de arquivo mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -96,6 +96,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -119,15 +120,15 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -140,13 +141,13 @@
 "anterior (compatível com Java 5) do JOSM.</li></ul>Mais informação:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Sair do JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Continuar, tentar assim mesmo"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -166,7 +167,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -176,6 +177,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -206,5 +207,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -393,6 +394,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -419,5 +420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -425,7 +426,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -433,5 +435,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -642,5 +644,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -892,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -899,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1079,6 +1081,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1230,5 +1232,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1461,6 +1463,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2141,5 +2143,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2458,7 +2460,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Dados baixados"
@@ -2718,8 +2720,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"A ignorar a excepção porque a transferência foi cancelada. A excepção foi: "
-"{0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2854,10 +2854,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3021,5 +3021,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3626,6 +3626,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Dados suspeitos. Enviar mesmo assim?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3675,40 +3675,40 @@
 msgstr "Alterar nós de {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Remover \"{0}\" para o nó ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Remover \"{0}\" para o caminho ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Remover \"{0}\" para relação ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Fixar {0}={1} para o nó ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Fixar {0}={1} para o caminho ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Fixar {0}={1} para a relação ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Remover \"{0}\" para {1} objetos"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3838,4 +3838,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Apagar confirmação"
@@ -4157,9 +4158,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Aviso: Falha a inicializar as preferências. Falha no reset do ficheiro de "
-"preferências para original: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4195,8 +4194,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Aviso: número de versão do JOSM inesperada no arquivo de revisão. O valor é "
-"\"{0}\""
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4303,11 +4300,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"O JOSM esperava encontrar a primitiva [{0} {1}] no conjunto de dados, mas "
-"ela não está lá. Por favor reporte isso em http://josm.openstreetmap.de . "
-"Esse não é um erro crítico e então deve ser seguro continuar com o seu "
-"trabalho."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4411,5 +4404,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4428,8 +4421,8 @@
 msgstr "multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4573,52 +4566,64 @@
 msgstr "Geografia WGS84"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Aviso: não foi possível abrir o fluxo de entrada do recurso ''/data/{0}''. "
-"Não foi possível ler o grid NTF<->RGF93"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Zonas Lambert 4 (França)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} a {2} graus)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Zona CC-Lambert"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Zona Lambert CC9 (França)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estônia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4647,81 +4652,101 @@
 "as preferências para corresponder ao código ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Grade Suíça"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Latvia TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Zona UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Norte"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Sul"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Hemisfério"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Deslocar 3.000.000m oeste"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunião RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM França (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "Sistema Geodésico UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4944,45 +4969,45 @@
 msgstr "Este teste checa se multipolígonos são válidos"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "O estilo de caminho da área não está fechado"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Sem caminho externo para múltipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Nenhum estilo de multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Nenhum estilo na relação multipoligonal"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Estilo para via interna igual a multi-polígono"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Estilo para caminho externo faltando"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipoligono não está fechado"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Multi-polígono da via interna está fora"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Interseção entre vias multi-polígonais"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Nenhuma regra últil para membro multipoligonal"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Não-via em multi-polígono"
@@ -5259,5 +5284,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5282,5 +5307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5291,5 +5316,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5704,5 +5729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5771,5 +5796,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "rodovia"
@@ -5777,5 +5802,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5783,10 +5808,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "hidrovia"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "uso da terra"
@@ -5796,5 +5821,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5808,5 +5833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5819,5 +5844,5 @@
 msgstr "transporte public"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6184,5 +6209,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6293,4 +6318,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6397,5 +6423,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6440,11 +6466,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Como alternativa você pode digitar o <strong>endereço de um tile</"
-"strong> no formato <i>nível de zoom/x/y</i>, i.e. <i>15/256/223</i>. Os "
-"endereços no formato <i>zoom,x,y</i> ou <i>zoom;x;y</i> também são válidos.</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6733,9 +6755,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista de elementos mesclados. Eles irão substituir os meus elementos quando "
-"as decisões de mesclagem forem aplicadas."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6987,10 +7007,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Manter minhas coordenadas"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Mantenha suas coordenadas"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7048,6 +7068,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7069,6 +7089,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7484,5 +7504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7729,5 +7749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7941,7 +7961,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr "desconhecido"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "Desconhecido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8205,5 +8255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8223,5 +8273,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8238,5 +8288,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Baixar membros incompletos das relações selecionadas"
@@ -8244,5 +8294,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Baixar membros incompletos"
@@ -8285,5 +8335,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8291,5 +8341,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8489,5 +8539,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8595,5 +8645,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Usuário"
@@ -9591,5 +9640,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9771,5 +9820,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9924,4 +9973,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Somente conjuntos de modificações que pertencem a mim"
@@ -9936,4 +9986,10 @@
 "Apenas conjuntos de modificações que pertencem ao usuário com o seguinte "
 "nome de usuário"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10240,9 +10296,9 @@
 msgstr "Esta URL de pesquisa de conjunto de modificações é inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10251,13 +10307,13 @@
 msgstr[1] "Isto vai mudar até {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Um valor vazio deleta a tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10270,18 +10326,19 @@
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Modificar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr "Substituir chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Substituir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10290,5 +10347,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10298,5 +10355,5 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10305,27 +10362,31 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Por favor, selecione os objetos que deseja modificar propriedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Propriedades/Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Propriedades dos objetos selecionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10334,62 +10395,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Posição"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Deletar da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Confirmar a exclusão da relação {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da chave selecionada para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Vá para o wiki do OSM, para ajuda de etiqueta (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Selecione a relação na seleção principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Selecionar os membros da relação selecionada"
@@ -10453,9 +10514,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10477,7 +10540,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Baixando {0} filho incompleto de {1} relações mães."
-msgstr[1] "Baixando {0} filhos incompletos de {1} relações mães."
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10821,9 +10884,4 @@
 msgstr "Houve {0} conflitos durante a importação."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10864,11 +10922,4 @@
 msgid "Load relation"
 msgstr "Carregar relação"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Aviso: ignorando exceção porque tarefa foi cancelada. A exceção foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11154,37 +11205,4 @@
 msgstr "Tipo"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "Desconhecido"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11308,20 +11326,20 @@
 msgstr "Coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Histórico para nó {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Histórico para via {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Histórico para relação {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Recarregar histórico do servidor"
@@ -11420,6 +11438,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Conjunto de modificações"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12021,14 +12039,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Uma operação de envio e/ou salvamento em uma camada com "
-"modificações<br>foi cancelada ou falhou.</html>"
 msgstr[1] ""
-"<html>Operações de envio e/ou salvamento de {0} camadas com "
-"modificações<br>foram canceladas ou falharam.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12472,4 +12486,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12503,13 +12518,4 @@
 "<html>Não foi possível enviar {0} objetos em somente uma requisição porque o "
 "<br>tamanho máximo ({1}) no servidor \"{2}\" foi excedido</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Será necessário <strong>múltiplos conjuntos de modificações</strong> "
-"para enviar {0}objetos. Qual estratégia você quer usar?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12587,38 +12593,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Personalizar cores"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Padrão"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Selecionar uma cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Descrição: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12629,9 +12635,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12639,26 +12645,26 @@
 msgstr "Descrição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Vigência"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Comprimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Comprimento: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12667,8 +12673,8 @@
 msgstr[1] "{0} rotas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12677,12 +12683,12 @@
 msgstr[1] "{0} pontos da via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "ponto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12691,10 +12697,10 @@
 msgstr[1] "{0} trilhas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12705,78 +12711,78 @@
 "aqui:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Baixar próximo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "somente trilha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "somente pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12787,11 +12793,11 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Não há trilha GPX disponível na camada para associar áudio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12801,6 +12807,6 @@
 "posterior ao final, foram omitidos ou movidos para o começo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12809,27 +12815,27 @@
 "Alguns pontos de interesse que ficaram muito longe da trilha foram omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Marcadores de Pontos Nomeados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Trackpoints nomeados de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importar Áudio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12842,29 +12848,29 @@
 "correlacionar os pontos com os dados de audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Importação não possível"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Árquivos de Áudio WAV (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de áudio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importar imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12971,5 +12977,5 @@
 msgstr "Foi encontrado os seguintes problemas:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12979,57 +12985,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Zoom automático"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Carregar quadros automaticamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Carregar quadro"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Exibir informação do quadro"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Carregar todos os quadros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Aumentar zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Diminuir zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Apagar cache de tiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "aumentar nível de zoom para ver mais detalhes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13581,10 +13595,10 @@
 msgstr "Imagens JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13592,5 +13606,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13599,21 +13613,21 @@
 msgstr[1] "{0} consiste em {1} marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Não existem marcadores de som nessa camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Mostrar Texto/Ícones"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Alternar visibilidade do marcador de texto e ícones."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Sincronizar áudio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13622,5 +13636,5 @@
 "sincronização"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13628,14 +13642,14 @@
 msgstr "Áudio sincronizado no ponto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Não foi possível sincronizar na camada sendo reproduzida."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13661,13 +13675,13 @@
 msgstr "Não foi possível criar um novo marcador de áudio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Houve um erro na tentativa de mostrar a URL deste marcador"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(A URL era: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Erro exibindo a URL"
@@ -14714,63 +14728,63 @@
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Desenhar setas de direção"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Somente no sentido da via."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Desenhar número de sequência dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Desenhar os limites dos dados recebidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Desenhar nós virtuais no modo escollhido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Desenhar camadas inativas em cor diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos do mapa suavizados (anti-alias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Desenhar somente linhas de fora da área"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Pontos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Desenhar sugestões de direção para os segmentos de trilha."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14779,10 +14793,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Desenhar os limites dos dados carregados do servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14790,9 +14804,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Desenhar as camadas de dados inativas em uma cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14802,15 +14816,51 @@
 "estilo selecionado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Dados OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Auto"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Nome"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Descrição"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Nenhum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Usar preferências globais."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14821,47 +14871,39 @@
 msgstr "Tudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Nenhum"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Forçar linhas se nenhum segmento for importado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Desenhe pontos GPS grandes."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Desenha um círculo com valor HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermelho = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Diluição da posição (vermelho = alta, verde = baixo, se disponível)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
@@ -14869,5 +14911,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14891,5 +14933,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14932,5 +14974,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14944,38 +14986,18 @@
 msgstr "A Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Criar marcadores quando ler um arquivo GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Desenhar rápido (vai parecer feio)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Auto"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Nome"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Descrição"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Ambos"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14986,10 +15008,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Desenhar linhas entre os pontos GPS brutos"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14999,10 +15021,10 @@
 "\"-1\" para desenhar todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Tamanho máximo para arquivos locais (em metros)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15011,10 +15033,10 @@
 "todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Tamanho máximo (em metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15023,10 +15045,10 @@
 "informações de linha."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Desenha setas de direção para linhas, conectando pontos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15035,5 +15057,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15042,14 +15064,14 @@
 "Não desenha a seta se ela não estiver a pelo menos esta distância da última."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Distância mínima (pixels)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenha pontos grandes para os pontos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15059,13 +15081,13 @@
 "personalizado no Gerenciador de Camadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Pontos coloridos e segmentos de trilha por velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15075,27 +15097,45 @@
 "equipamento de captura precisa registrar essas informações."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permita ajustar a cor da trilha para diferentes médias de velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Coloração de trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Rótulo dos pontos da via"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15793,5 +15833,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15883,5 +15923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reiniciar"
@@ -16175,6 +16215,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Sempre atualizar sem perguntar"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16599,5 +16639,5 @@
 msgstr "Nova relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16626,9 +16666,9 @@
 msgstr "Buscar pré-definição"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Exibir somente aplicável para seleção"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Procurar nas etiquetas"
@@ -16919,6 +16959,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -17246,5 +17286,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -17464,5 +17504,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17857,4 +17897,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Salvar usuário e senha (sem encriptação)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18690,4 +18735,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18813,4 +18860,18 @@
 msgstr "Falhou ao carregar esquema XML."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19383,5 +19444,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35690,4 +35751,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35704,6 +35766,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35722,15 +35784,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "nome de rua abreviado"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "Tag de sentido único em um nó"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "tag de ponte em um nó"
@@ -35741,12 +35803,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "tag de rodovia em um nó"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Estrada não classificada sem nome"
@@ -35755,16 +35817,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "Autoestrada se referência"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "tipo de rodovia temporária"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "valor incorreto"
@@ -35774,10 +35836,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "Ciclovia com tag bicicleta"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -35786,10 +35848,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "Barreira usada em um caminho"
@@ -35798,35 +35860,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "velocidade máxima usada para via de pedestres"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "tag de layer com sinal +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "Nome de rua contém ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relação sem tipo"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurante sem nome"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "Combinação de tags não ususal"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35931,117 +36002,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Mapas NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "Mapas NPE (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japão (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japão (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT japão (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Itália"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicília - Itália"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36291,6 +36372,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Envio cancelado"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36392,9 +36473,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36412,23 +36493,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36436,26 +36547,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informações sobre o plugin"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36463,6 +36602,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Corrigir endereços"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -36572,9 +36711,9 @@
 msgstr "Mostrar dados incompletos"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "itens"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "sem itens"
@@ -36675,17 +36814,34 @@
 msgstr "Selecionar todos os endereços com dados incompletos."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Propriedades da camada"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Importar imagem"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Importar imagem georreferenciada"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Erro ao criar camada de imagem: "
@@ -37318,28 +37474,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37465,9 +37628,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Substituir o plano de fundo original branco pela cor de plano de fundo "
-"definida nas preferências do JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38365,5 +38526,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38373,17 +38534,17 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Desenhar linhas entre pontos para esta camada."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Não desenhar linhas entre pontos para esta camada."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Selecionar opções de linha"
@@ -38535,5 +38696,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38541,10 +38702,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38553,5 +38714,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38560,6 +38721,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38568,9 +38729,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38729,71 +38890,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38801,32 +38970,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38861,6 +39024,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38991,30 +39154,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39700,5 +39876,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39715,5 +39891,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40445,17 +40621,17 @@
 msgstr "Nova camada de imagem a partir da área de transferência"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Arquivos de imagem suportados"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Nova camada de imagem a partir do arquivo..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Não é possível encontrar o objeto do mapa."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "O PicLayer falhou ao carregar ou importar a imagem."
@@ -40469,43 +40645,33 @@
 msgstr "Os dados da área de transferência não é são de imagem"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(definir  \"{0}\"  para sim/não/perguntar nas preferências\n"
-"para controlar o carregamento automático dos arquivos de calibração)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "Você deseja aplicar?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "Carregar arquivo de calibração ?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Irá ser aplicado automaticamente."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-"Também, a partir de agora, os arquivos cal irão ser carregados "
-"automaticamente."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Definir  \"{0}\"  para sim/não/perguntar nas preferências\n"
-"para controlar o carregamento automático dos arquivos de calibração."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -41126,5 +41292,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -42097,4 +42263,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -42314,6 +42497,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -42563,6 +42746,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Abrir um editor para a restrição de conversão selecionada"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43156,5 +43339,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43543,3468 +43726,150 @@
 msgstr ""
 
-#~ msgid "Update Plugins"
-#~ msgstr "Atualizar Plugins"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin atualizado com sucesso. Por favor, reinicie o JOSM."
-#~ msgstr[1] "{0} Plugins atualizados com sucesso. Por favor, reinicie o JOSM."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Não foi possível baixar o plugin: {0} de {1}"
+#~ msgid "Change values?"
+#~ msgstr "Modificar valores?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "Combinação de tags não ususal"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Manter minhas coordenadas"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Mantenha suas coordenadas"
 
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
+
+#~ msgid ""
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "O plugin {0} parece estar com problemas ou não pôde ser baixado "
-#~ "automaticamente."
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Erro de interpretação: estrutura inválida para documento gpx"
+#~ "Lista de elementos mesclados. Eles irão substituir os meus elementos "
+#~ "quando as decisões de mesclagem forem aplicadas."
 
 #~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
+
+#~ msgid ""
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Não foi possível conectar com o servidor OSM. Por favor, verifique sua "
-#~ "conexão de internet."
+#~ "A ignorar a excepção porque a transferência foi cancelada. A excepção "
+#~ "foi: {0}"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "O servidor retornou um erro interno. Reduza a área ou tente novamente em "
-#~ "instantes."
-
-#~ msgid "Commit comment"
-#~ msgstr "Gravar comentário"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Abrindo conjunto de mudanças..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Servidor não suporta conjunto de mudanças"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Enviando..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ "Aviso: Falha a inicializar as preferências. Falha no reset do ficheiro de "
+#~ "preferências para original: {0}"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Envio cancelado"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Transferência interrompida devido a erro (esperando por 5 segundos):"
-
-#~ msgid "Unknown version"
-#~ msgstr "Versão desconhecida"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interrompendo..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Digite a Senha"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Alterações Não Salvas"
-
-#~ msgid "Do not show again"
-#~ msgstr "Não mostrar novamente"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "position"
-#~ msgstr "posição"
-
-#~ msgid "different"
-#~ msgstr "diferente"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "true"
-#~ msgstr "verdadeiro"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotacionar"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "O"
-
-#~ msgid "E"
-#~ msgstr "L"
-
-#~ msgid "Change"
-#~ msgstr "Alterar"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Encontrado elemento <nd> em non-way."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Faltando atributo obrigatório \"{0}\"."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Objeto ilegal com id=0"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Preparando dados..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Erro durante interpretação."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Exceção NullPointerException, possivelmente faltam algumas tags."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Encontrado elemento <member> em non-relation."
+#~ "Aviso: número de versão do JOSM inesperada no arquivo de revisão. O valor "
+#~ "é \"{0}\""
+
+#~ msgid "Changeset"
+#~ msgstr "Conjunto de modificações"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Sempre atualizar sem perguntar"
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
-#~ "mais necessário."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Senha ou usuário incorreto."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Identificação de nó mal-formada"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin não encontrado: {0}."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Existem modificações não-salvas. Descartar alterações e continuar?"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin necessita de atualização do JOSM: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Você pode alterar o número de dias depois que este irá "
-#~ "aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> tem ref zero"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Por favor, reporte um erro em {0}"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Uma exceção não esperada aconteceu.\n"
-#~ "\n"
-#~ "Isto é sempre um erro de programação. Se estiver rodando\n"
-#~ "a ultima versão do JOSM, por favor, reporte um bug."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "O plugin não pode ser removido. Por favor, reporte o problema aos "
-#~ "desenvolvedores do JOSM."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Inclua os passos para repetir o erro (o mais detalhado possível)!"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar "
-#~ "um bug."
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Não aplicar alterações"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Tenha certeza de incluir a seguinte informação:"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Membro vazio na relação."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "via multipolígonos \"{0}\" não está fechada."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Apagado membro ''{0}'' na relação."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Way ''{0}'' com menos de dois pontos."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Todos os plugins estão atualizados."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Informação de plugin baixada de {0} site"
-#~ msgstr[1] "Informações de plugin baixadas de {0} sites"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Não foi possível encontrar informações de plugin."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Houveram problemas com os seguintes plugins:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Erro apagando o arquivo de plugin: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin já existe"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Baixando plugins que faltam"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Baixar os seguintes plugins?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Arquivo de plugin já disponível. Você deseja baixar a versão atual e "
-#~ "deletar a existente?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versão {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Atualize os seguintes plugins:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem "
-#~ "permissão de sobreescrever os existentes."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "O plugin {0} é requerido pelo plugin {1} mas não foi encontrado."
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Erro lendo o arquivo de plugin: {0}"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} faltando. Subindo {4}: {5} (id: {6})"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "A projeção não pode ser lida das preferências. Usando EPSG:4326"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Regra desconhecida \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Tipo de membro desconhecido para \"{0}\"."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Estilo para restrição {0} não encontrado."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Não há via externa no multipolígono \"{0}\"."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Via interna \"{0}\" está fora."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Erro: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Aviso: {0}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Não foi possível abrir o diretório de preferências: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr ""
-#~ "O arquivo de preferência tinha erros. Fazendo cópia de segurança da "
-#~ "versão antiga em {0}."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "A projeção \"{0}\" foi projetada somente para \n"
-#~ "latitudes entre 46.1° and 57°.\n"
-#~ "Use outro sistema de projeção se você não estiver\n"
-#~ "utilizando um servidor WMS francês.\n"
-#~ "Não transfira nenhum dado após esta mensagem."
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Zona Lambert (França)"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Graus Minutos Segundos"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANTE: dados posicionados após\n"
-#~ "os limites de zona Lambert.\n"
-#~ "Não transfira nenhum dado após esta mensagem.\n"
-#~ "Desfaça sua última ação, salve seu trabalho\n"
-#~ "e comece uma nova camada na nova zona."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Remover Membro da Relação"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Remover \"{0}\" para {1} ''{2}''"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Seleção \"{0}\" é usada pela relação \"{1}\" com a regra {2}.\n"
-#~ "Apagar da relação?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolva {0} conflitos em {1} objetos"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Seleção \"{0}\" é usada pela relação \"{1}\".\n"
-#~ "Apagar da relação?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relação conflitando"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Salvar e Sair"
-
-#~ msgid "Login"
-#~ msgstr "Login"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "near"
-#~ msgstr "próximo"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Por favor, entre com texto de busca"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Não foi possível ler resultados de busca de place do servidor"
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Por favor, entre com um nome para a location."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Por favor, entre com as coordenadas desejadas primeiro."
-
-#~ msgid "x from"
-#~ msgstr "x de"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: Use roda do mouse ou clique duplo. Mover mapa: Segure botão direito "
-#~ "do mouse e mova. Selecionar: Clique."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecione um favorito primeiro"
-
-#~ msgid "zoom level"
-#~ msgstr "nível de zoom"
-
-#~ msgid "to"
-#~ msgstr "para"
-
-#~ msgid "y from"
-#~ msgstr "y de"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Você pode usar o mouse ou Ctrl+Setas direcionais /./ para zoom e pan."
-
-#~ msgid "Download Area"
-#~ msgstr "Baixar Área"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Grupo de preferências \"{0}\""
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Um valor vazio apaga a chave."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contatando servidor OSM..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Editar Propriedades"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etiquetas (um valor nulo excluir etiqueda)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Ocupado por"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Editar nova relação"
-
-#~ msgid "Create new relation"
-#~ msgstr "Criar nova relação"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Editar relação #{0}"
-
-#~ msgid "Move Up"
-#~ msgstr "Mover para cima"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Baixar todas vias imcompletas e nós desta relação"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Eliminar todos objetos selecionados da relação"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Excluir selecionados"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Adicionar todos os objetos selecionados como membros"
-
-#~ msgid "Add Selected"
-#~ msgstr "Adicionar Selecionado"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Remover da relação o membro na linha atual"
-
-#~ msgid "Move Down"
-#~ msgstr "Mover para baixo"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Clicar em Atualizar para atualizar lista"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Não foi possível conectar ao servidor."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Erro analizado resposta do servidor"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Existiram conflitos durante a importação"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Membros: {0}"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor de relações: {0}"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Reverter o estado de todos os objetos atualmente selecionados para a "
-#~ "versão escolhida na lista do histórico."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Não implementado ainda."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autores: {0}"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Existem mudanças não-salvas. Excluir camada mesmo assim?"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Excluir Camada"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Excluir camada selecionada."
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Unir camada diretamente inferior com camada selecionada."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Mostrar/Esconder Texto/Ícones"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Camadas: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Atualizar lista de seleção"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Conflitos: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Combinar conflitos"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Pilha de comandos: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Resolver conflito"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver conflitos"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "ponto"
-#~ msgstr[1] "pontos"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} ponto"
-#~ msgstr[1] "{0} pontos"
-
-#~ msgid "File could not be found."
-#~ msgstr "Arquivo não pode ser encontrado."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Alguns dos nós estão (praticamente) na linha"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Combinar caminhos com membros diferentes?"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Entrada de valores para todos conflitos"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Todos caminhos estavam vazios"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Resolver conflitos"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Estes nós não estão em um círculo"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Por favor selecione três nós ou um caminho com exatamente três nós."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
-
-#~ msgid "gps track description"
-#~ msgstr "Descrição da trilha do GPS"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Ajuda Online do JOSM"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erro ao carregar página {0}"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Exibir histórico de informações sobre nós e caminhos OSM"
-
-#~ msgid "History of Element"
-#~ msgstr "Histórico do Elemento"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Página de ajuda faltando. Crie ela em <A HREF=\"{0}\">portugues</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ajuda faltando. Crie ela em <A HREF=\"{0}\">portugues</A> ou<A "
-#~ "HREF=\"{1}\">seu idioma</A>."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Por favor selecione no mínimo um nó, caminho ou relação. Somente "
-#~ "elementos carregados possuem histórico."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Por favor selecione no mínimo dois nós para unir."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
-#~ "pretende uni-los?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Unir nós com usuários diferentes?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Unir mesmo assim"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Não é possivel unir nós: Será necessário deletar o caminho que ainda é "
-#~ "usado."
-
-#~ msgid "Create a new map."
-#~ msgstr "Criar novo mapa."
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "falha na importação NMEA"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Sentenças mal formadas: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Sentenças desconhecidas: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Erros de consistência(checksum): "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Cordenadas Zero: "
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Seleção deve consistir em somente dois caminhos"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Somente dois nós permitidos"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Por favor selecione caminhos com ângulos praticamente retos para "
-#~ "ortogonalização"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Somente um nó selecionado"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Abrir uma página de preferências para configurações globais"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Não foi possível renomear o arquivo \"{0}\"."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Ocorreu um erro enquanto o arquivo backup estava sendo restaurado."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Ocorreu um erro durante o salvamento."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Nenhum dos nós destes caminhos está grudado a algo."
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Abrir no Navegador Web"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Atualiza os dados da camada atual a partir do servidor (recarrega dados)"
-
-#~ msgid "Update Data"
-#~ msgstr "Atualizar Dados"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma "
-#~ "camada de dados?"
-
-#~ msgid "Jump back."
-#~ msgstr "Pular de volta."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Avanço Lento"
-
-#~ msgid "Jump forward"
-#~ msgstr "Pular a frente"
-
-#~ msgid "No data imported."
-#~ msgstr "Não há dados importados."
-
-#~ msgid "Data Layer"
-#~ msgstr "Camada de Dados"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Selecionar, mover e girar objetos"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Arraste um segmento de caminho para fazer um retângulo"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO! (GNOME)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO! (WebKit GTK)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO! (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO! (GNOME Fix)"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Faltando número de versão nos dados dos mapas"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Versão desconhecida: {0}"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Ocorreram os seguintes erros durante o download em massa:"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Não foi possível ler da URL: \"{0}\""
-
-#~ msgid "their version:"
-#~ msgstr "versão deles:"
-
-#~ msgid "my version:"
-#~ msgstr "minha versão:"
-
-#~ msgid "Set the language."
-#~ msgstr "Escolha o idioma."
-
-#~ msgid "Full Screen"
-#~ msgstr "Tela Cheia"
-
-#~ msgid "File not found"
-#~ msgstr "Arquivo não encontrado"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Imagens para {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imagem"
-#~ msgstr[1] "imagens"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Sincronizar Tempo com Unidade GPS"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} apagado.)"
-
-#~ msgid "Download List"
-#~ msgstr "Lista de Download"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Impossível ler uma projeção do arquivo de preferências. Usando Mercator"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Não foi possível ler a projeção a partir das preferências. Usando Mercator"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por "
-#~ "favor, relate isso como uma falha do programa."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Sim, repô-los também"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Não, cancelar operação"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Faltando primitiva"
-
-#~ msgid "Update failed"
-#~ msgstr "Atualização falhou"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Há  <strong>{0}</strong> primitivas <br>selecionadas para "
-#~ "atualização individual. Por favor, reduza a seleção<br>para máx. {1} "
-#~ "primitivas.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Seleção é muito grande"
-
-#~ msgid "Update Selection"
-#~ msgstr "Atualizar Seleção"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Atualiza as primitivas selecionadas a partir do servidor"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Não há primitivas selecionadas para atualizar."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Enviar todas as modificações ao servidor OSM."
-
-#~ msgid "Uploading"
-#~ msgstr "Enviando"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Atualizando primitiva"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Sincronizar {0} {1} apenas"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Detectado conflito"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiva já deletada"
-
-#~ msgid "Next Marker"
-#~ msgstr "Próximo Marcador"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Avanço Rápido"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Erros ao Transferir"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Primitivas deletadas ou movidas"
-
-#~ msgid "Previous Marker"
-#~ msgstr "Marcar Anterior"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Tocar marcador prévio."
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Os seguintes erros aconteceram durante a transferência em massa:"
-
-#~ msgid "Downloading..."
-#~ msgstr "Transferindo...."
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Erro de comunicação com o servidor."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Recuperando relação..."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Recuperando Caminho..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Manter meu"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Recuperar primitivas dependentes?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Existem {0} primitivas adicionais referentes à relação {1}<br>que "
-#~ "estão apagado no servidor.<br><br>Deseja recuperá-los também?</html>"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Existem {0} nós adicionais usados pelo caminho {1}<br>que foram "
-#~ "removidos do servidor.<br><br>Você deseja desfazer a remoção destes nós "
-#~ "também?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Desfazer a remoção dos nós adicionais?"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Duplicar {0} nós em {1} nós"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr ""
-#~ "Não foi possível selecionar a primitiva com o id {0} no conjunto de dados "
-#~ "atual"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Falha ao apagar as primitivas selecionadas."
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "valor não esperado de retorno. Veio {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitiva apagada no servidor"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>A primitiva OSM com o id <strong>{0}</strong> foi apagada<br>no "
-#~ "servidor por outro mapeador.<br><br>Clique <strong>{1}</strong> para "
-#~ "manter sua primitiva e ignorar o estado atual de \"apagada\".<br>Sua "
-#~ "primitiva será definida com um novo id.<br>Clique <strong>{2}</strong> "
-#~ "para aceitar o estado no servidor e apagar sua primitiva.<br>Clique "
-#~ "<strong>{3}</strong> para cancelar.<br>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Deletar meu"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Enviar para o OSM..."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Verificando se o nó {0} se foi..."
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Envio para API OSM falhou"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\""
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Verificando se a primitiva {0} se foi..."
-
-#~ msgid "Play next marker."
-#~ msgstr "Reproduzir marcador seguinte."
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Envio <strong>falhou</strong> porque uma primitiva que você "
-#~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro é:"
-#~ "<br>{0}</html>"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Rua Augusta</b> - 'Rua' and 'Augusta em qualquer chave ou valor."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Por favor, entre com uma string de busca."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check these primitives individually.<br>Click <strong>{2}</"
-#~ "strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Existem {0} primitivas no seus dados locais que <br>podem ser "
-#~ "deletadas no servidor. Se você tentar depois apagá-las ou <br>atualizá-"
-#~ "las, o servidor poderá acusar um<br>conflito.<br><br>Clique <strong>{1}</"
-#~ "strong> para veriricar estas primitivas individualmente.<br>Clique "
-#~ "<strong>{2}</strong> para ignorar.<br></html>"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Arraste para mover objetos; Shift para adicionar seleção (Ctrl para "
-#~ "alternar); Shift-Ctrl para rotacionar seleção; ou altere seleção"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Clique para apagar. Shift: apaga segmento de caminho. Alt: não apaga nós "
-#~ "não usados ao apagar um caminho. Ctrl: apaga  objetos referentes."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objetos com um ID determinado"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "AVISO: lançando janela do browser para somente as primeiras {0} das {1} "
-#~ "primitivas selecionadas"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Usar casas decimais."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Digite as coordenadas do novo nó."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Valores negativos são para coordenadas dos hemisférios Sul/Oeste."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "O número de alterações atuais ultrapassa o número máximo de alterações. O "
-#~ "número atual é {0}, o máximo é {1}"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los "
-#~ "mesmo assim?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Combinar assim mesmo"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">english</A> ou <A HREF="
-#~ "\"{1}\">português</A>."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nenhum documento aberto, portanto não há nada a salvar."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensão de arquivo desconhecida."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Não foi possível fazer backup do arquivo."
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem "
-#~ "ter sido apagadas do servidor. Se você posteriormente tentar exclui-las "
-#~ "ou<br>atualizá-las no servidor provavelmente o servidor apontará "
-#~ "um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o "
-#~ "estado dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> "
-#~ "para ignorar.<br></html>"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nós:</b>... - objeto com um determinado número de nós"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "O tamanho do valor para a tag ''{0}'' na primitiva  {1} excede o tamanho "
-#~ "máximo permitido de {2}. O tamanho é {3}."
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde."
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Aviso: truncanto automaticamente o valor da tag ''{0}'' na primitiva "
-#~ "deletada {1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "Falha na initialização da API"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Baker Street\"</b> - 'Baker Street' em qualquer chave ou nome."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:May</b> - 'Bak' em qualquer parte do nome."
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - chave 'type' com valor exato 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - chave 'type' com qualquer valor. Tente também  "
-#~ "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "AVISO: formato inesperado de URL de base do API. O redirecionamento para "
-#~ "a página de histórico de primitiva do OSM provavelmente não funcionará. A "
-#~ "URL de base do API é: ''{0}''"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - 'Bak' não existe no nome."
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Uma filiação de relação foi copiada para todos os novos caminhos.\n"
-#~ "Por favor, verifique e corrija quando necessário."
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr "Usar <b>\"</b> para operadores de aspas (se a chave contém :)"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Uma filiação de relação com base na atribuição foi copiada para todos os "
-#~ "novos caminhos.\n"
-#~ "Verifique e corrija quando necessário."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Você está usando a projeção EPSG:4326 que pode levar "
-#~ "a<br>resultados indesejados quando fizer alinhamentos retangulares."
-#~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Remover \"{0}\" para {1} {2}"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Falha em inicializar a comunicação com o servidor OSM {0}.\n"
-#~ "Verifique a URL do servidor nas preferências e também a sua conexão à "
-#~ "internet."
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Apagar {1} {0}"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Há conflitos não resolvidos. Você deve resolvê-los primeiro."
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Apagar {1} {0}"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Nenhuma caminho \"para\" encontrado."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Mais de um caminho \"de\" encontrado."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Mais de um caminho \"para\" encontrado."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Caminho para Estilo de Área não está fechado."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "\"{0}\" não é um caminho no multipolígono."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Nenhum caminho \"de\" encontrado."
-
-#~ msgid "Load Selection"
-#~ msgstr "Carregar Seleção"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contato {0}..."
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Número de parametros incorreto para operador de nós."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Valor incorreto de operador de nós: {0}. O operador de nós espera un "
-#~ "número de nós ou um intervalo, por exemplos, os nós:10-20"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Faltam argumentos para \"or\""
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Fechamento de parenteses esperado."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Falta argumento para \"not\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Erro processando URL: \"{0}\""
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Purgando 1 primitiva"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Definir {0}={1} para {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Definir {0}={1} para {2} {3}"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "não foi possível resolver conflito não-definido"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "removendo referência de caminho {0}"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividir segmento de via"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Desfazendo exclusão de {0} primitivas"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "removendo referência da relação {0}"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Resolver {0} conflito de tag em {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Resolver conflitos na lista de nós do caminho {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Resolver conflitos de versão para {0} {1}"
-
-#~ msgid "changeset"
-#~ msgstr "conjunto de mudanças"
-
-#~ msgid "changesets"
-#~ msgstr "conjunto de mudanças"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Não há primitiva com versão {0} neste histórico"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "não foi encontrada a última versão. Histórico está vazio."
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "não é possível comparar um primitivo com id ''{0}'' com um primitivo com "
-#~ "id ''{1}''"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Encontrado mais de um parâmetro \"via\"."
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parâmetro ''{0}'' não pode ser nulo"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Não foi possível escrever Favorito.."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Não foi possível ler os Favoritos."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "A projeção \"{0}\" foi desenhada apenas para\n"
-#~ "latitudes entre 45.7° e 47.9°\n"
-#~ "e longitutes entre 5.7° e 10.6°.\n"
-#~ "Use outro sistema de projeção se você não está trabalhando\n"
-#~ "em um dataset da Suíça ou de Liechtenstein.\n"
-#~ "Não faça o upload de nenhuma informação depois desta mensagem."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Abrir arquivo (como raw gps, se .gpx)"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ChangeRelationMemberRole"
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr ""
-#~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto "
-#~ "de dados"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Minha primitiva com id {0} e versão {1} é visível, mas sua primitiva com "
-#~ "versão menor {2} não é visível. Não é possível tratar esta "
-#~ "inconsistência. Mantendo minha primitiva. "
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- versão em execução é {0}"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Ativando plugins atualizados"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Em vez de --download=<bbox>, você pode especificar osm://<bbox>\n"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Mudar para Tela Cheia"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parâmetros são lidos na ordem em que são informados, por isso tenha "
-#~ "certeza que você está carregando\n"
-#~ "alguma coisa antes de --selection"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Erro enquanto analisando"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} conflitos de tagueamento à serem resolvidos"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "valor inesperado do parâmetro \"index\": {0}"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copiar meus elementos selecionados para o fim da lista de elementos "
-#~ "combinados"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Copiar os elementos selecionados deles antes do primeiro elemento "
-#~ "selecionado na lista de elementos combinados"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Copiar meus elementos selecionados depois do primeiro elemento "
-#~ "selecionado na lista de elementos combinados"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Copiar meus elementos selecionados antes do primeiro elemento selecionado "
-#~ "na lista de elementos combinados"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Copiar os elementos selecionados deles para o fim da lista de elementos "
-#~ "combinados"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Copiar os elementos selecionados deles para o começo da lista de "
-#~ "elementos combinados"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Clique <strong>{0}</strong> para terminar de combinar as minhas "
-#~ "entradas e as deles</html>"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Clique <strong>{0}</strong> para começar a combinar as minhas "
-#~ "entradas e as deles</html>"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Remover as entradas selecionadas da lista de elementos combinados"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Mover para baixo as entradas selecionadas em uma posição"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parâmetro '{0}' não pode ser nulo"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Um erro ocorreu durante a comunicação com o servidor.<br>Detalhes: "
-#~ "{0}</html>"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "visível (no servidor)"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "A comunicação com o servidor falhou"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "não visível (no servidor)"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Mantenha uma cópia da versão local"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "football"
-#~ msgstr "futebol americano"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Etiquetas({0} conflitos)"
-
-#~ msgid "Goods"
-#~ msgstr "Carga"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Altura máxima (metros)"
-
-#~ msgid "Boat"
-#~ msgstr "Barco"
-
-#~ msgid "Motorboat"
-#~ msgstr "Barco motorizado"
-
-#~ msgid "Footway"
-#~ msgstr "Calçada"
-
-#~ msgid "Cycleway"
-#~ msgstr "Ciclovia"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "item {0} não encontrado na lista"
-
-#~ msgid "No data"
-#~ msgstr "Não há dados"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Você moveu mais do que {0} elementos. Mover um grande número de elementos "
-#~ "quase sempre é um erro.\n"
-#~ "Quer realmente movê-los?"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Mudar {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Somar {0} {1}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está "
-#~ "mais presente"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "já registrado um conflito para a primitiva \"{0}\""
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Camada {0} deve estar na lista de camadas"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Move uma posição acima os elementos selecionados"
-
-#~ msgid "Visible State:"
-#~ msgstr "Estado Visível:"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geographico"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Length: "
-#~ msgstr "Comprimento: "
-
-#~ msgid "History item"
-#~ msgstr "Historia do iten"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Membros: {0} (conetado: {1})"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Historia por {0} {1}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Ler GPX..."
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "uma trilha com {0} ponto"
-#~ msgstr[1] "uma trilha com {0} pontos"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Configurações de Proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anônimo"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM senha"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Copiar padrões"
-
-#~ msgid "Public"
-#~ msgstr "Público"
-
-#~ msgid "All images"
-#~ msgstr "Todas as imagens"
-
-#~ msgid "Default Values"
-#~ msgstr "Valores Predefinidos"
-
-#~ msgid "Zone"
-#~ msgstr "Zona"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Zona Lambert"
-
-#~ msgid "World"
-#~ msgstr "Mundo"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "end"
-#~ msgstr "terminar"
-
-#~ msgid "Optional"
-#~ msgstr "Opcional"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continuar assim mesmo"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Descongelar a lista de elementos mesclados e iniciar mesclagem"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Congelar a lista atual de elementos mesclados"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Eliminar fisicamente os dados locais"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "ajustável {0} ainda não é registrado"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "ajustável {0} ainda não é registrado. Não é possível definir a "
-#~ "participação no ajuste sincronizado"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Aplicar parcialmente as resoluções"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Carregando histórico para {0} com id {1}"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html> Falha ao carregar histórico a partir do servidor. Detalhes: <br> "
-#~ "{0} </ html>"
-
-#~ msgid "<multiple>"
-#~ msgstr "<múltiplo>"
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr ""
-#~ "Falha ao difinir referência. Versão de referência {0}  dnão disponível no "
-#~ "histórico"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr "Histórico não inicializado ainda. Falha ao definir primitivo atual."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sincronizar relógio"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Rotacionar {0} {1}"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "Zona UTM {0}"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Apagar membro de relação {0}{1}"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "lista em regra {0} não está participando de um par comparado"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
-
-#~ msgid "More details"
-#~ msgstr "Mais detalhes"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflitos nos dados"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "indice inesperado na coluna. Obtido {0}"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Sim, limpe-o"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Resetar id para 0"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html> JOSM terá de remover sua primitiva local com id {0} <br> dos "
-#~ "dados. <br> Concorda? </ html>"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html> Para manter a sua versão local, o JOSM<br>precisa reiniciar o id "
-#~ "de {0} {1} para 0. <br> No próximo envio o servidor irá<br>atribuir-lhe "
-#~ "um novo id. <br> Você concorda? </ html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Remover do conjuto de dados"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>  Você não terminou de resolver todos os conflitos. <br> Clique "
-#~ "<strong> {0} </ strong> para já aplicar os conflitos resolvidos. <br> É "
-#~ "possível resolver os conflitos restantes posteriormente. <br> Clique "
-#~ "<strong> {1} </ strong> para retornar a resolução dos conflitos. </ html>"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "índice fora dos limites. Obtido {0}"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Fontes e tipos de dados"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Roda do mouse, duplo clique ou Ctrl + flecha para Cima / "
-#~ "Baixo <b> Mover mapa: </b> Segure botão direito do mouse e mova o cursor "
-#~ "ou use as teclas. <b>Selecione:</b> Clique."
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "histórico não foi inicializado ainda. Falha ao definir primitiva de "
-#~ "referência."
-
-#~ msgid "Timespan: "
-#~ msgstr "Intervalo de Tempo: "
-
-#~ msgid "failed to set current. current version {0} not available in history"
-#~ msgstr ""
-#~ "Falha ao definir atual. Versão atual {0} não está disponível no histórico"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} dentro da faixa"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "A data no arquivo \"{0}\" não pode ser analisada."
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Conflict created"
-#~ msgstr "Conflito criado"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Enviar estas modificações?"
-
-#~ msgid "Shop"
-#~ msgstr "Loja"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parâmetro \"{0}\" não pode ser vazio"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)"
-
-#~ msgid "start"
-#~ msgstr "iniciar"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Largura máx. (metros)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Comprimento Máx. (metros)"
-
-#~ msgid "Edit Station"
-#~ msgstr "Editar Estação"
-
-#~ msgid "Station"
-#~ msgstr "Estação"
-
-#~ msgid "Edit Airport"
-#~ msgstr "Editar Aeroporto"
-
-#~ msgid "Accomodation"
-#~ msgstr "Acomodação"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Editar Centro de Informações Turísticas"
-
-#~ msgid "Map Type"
-#~ msgstr "Tipo de Mapa"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid "citymap"
-#~ msgstr "mapa da cidade"
-
-#~ msgid "bicyclemap"
-#~ msgstr "mapa de ciclovias"
-
-#~ msgid "Board Type"
-#~ msgstr "Tipo de Quadro"
-
-#~ msgid "board"
-#~ msgstr "quadro"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Descarregamento primitivas referenciadas a uma das primitivas selecionadas"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) carregando pais da primitiva {2}"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Envio <strong>falhou</strong>.<br>{0}</html>"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "regra {0} não participa no par de comparação {1}"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Manter seu estado visível"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Manter meu estado visível"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Sim, resetar id"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "nós combinados não congelados ainda. Não é possível construir comando de "
-#~ "resolução"
-
-#~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
-#~ "{0}"
-#~ msgstr ""
-#~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: "
-#~ "{0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Mostrar histórico da primitiva selecionada"
-
-#~ msgid "Amenities"
-#~ msgstr "Comodidades"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Quantidade de Cabos"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Adicionar todas primitivas selecionadas nos dados atuais antes do "
-#~ "primeiro membro"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Adicionar todas primitivas selecionadas nos dados atuais depois do "
-#~ "primeiro membro"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Adicionar todas primitivas selecionadas nos dados atuais antes do "
-#~ "primeiro membro selecionado"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Adicionar todas primitivas selecionadas nos dados atuais depois do "
-#~ "primeiro membro selecionado"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Apagar tags selecionadas atuais"
-
-#~ msgid "Linked"
-#~ msgstr "Vinculado"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong> por "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Sem tempo para ponto {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Não foram encontradas imagens com dados de tempo legíveis"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Iniciar GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "delta atual: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Finalizar GPS: {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "diferença de zona horária: "
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "O tempo informado não pode ser analisado."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Zona horária do GPS (diferença com foto)"
-
-#~ msgid "layer not in list."
-#~ msgstr "camada não está na lista."
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Tem certeza que quer excluir a camada inteira?"
-
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Falha ao acessar propriedade de sistema ''{0}'' por razões de segurança. "
-#~ "Exceção foi: {1}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Conflitos durante download"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Combinar primitivas selecionadas atualmente em outra camada"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr ""
-#~ "<html>Não foi possível ler arquivo ''{0}''. O erro é: <br>{1}</html>"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "enviar todas modificações em um pedido"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Habilitar para envio de todas modificações em uma chamada, desabilitar "
-#~ "para usar uma chamada por primitiva"
-
-#~ msgid "Confirmation"
-#~ msgstr "Confirmação"
-
-#~ msgid "Delete all"
-#~ msgstr "Apagar tudo"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Múltiplos membros referenciando a mesma primitiva"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Baixando referencias desde OSM..."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Baixando referencias..."
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Adicionar uma nova camada"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF="
-#~ "\"{1}\">português</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está "
-#~ "mais presente"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parâmetro ''{0}'' não pode ser nulo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "valor não esperado de retorno. Veio {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Não há primitiva com versão {0} neste histórico"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "não foi encontrada a última versão. Histórico está vazio."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "não é possível comparar um primitivo com id ''{0}'' com um primitivo com "
-#~ "id ''{1}''"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Nós mesclados ainda não congelados. Não é possível construir comando de "
-#~ "resolução"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "indice inesperado na coluna. Obtido {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "nós combinados não congelados ainda. Não é possível construir comando de "
-#~ "resolução"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "índice fora dos limites. Obtido {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Mostrar histórico da primitiva selecionada"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Não foi possível ler \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Não foi possível conectar com o servidor OSM. Por favor, verifique sua "
-#~ "conexão de internet."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "Aviso: formato inesperado da URL base da API. Redireccionar para a "
-#~ "informação ou para a página do histórico do OSM primitivo vai, "
-#~ "provavelmente, falhar. A URL base da API é: \"{0}\""
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Não pode ler o ficheiro ''{0}''.<br> Erro: <br>{1}</html>"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "Para {0} primitiva"
-#~ msgstr[1] "Para {0} primitivas"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Mover sempre e não mostrar dica outraves"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Não pode procurar porque não exite informação carregada."
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "Os seguintes erros ocorrem aquando um transferencia em massa:{0}"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
-#~ "<br>Apagar da relação?</html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>A camada ''{0}'' já se encontra em conflicto com a "
-#~ "primitiva<br>''{1}''.<br>Este conflito não pode ser adicionado.</html>"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Resolver os conflictos da versão no caminho {0}"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Resolver os conflictos da versão no nó {0}"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Resolver os conflictos da versão na relação {0}"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Aviso: Falhou a inicialização das preferências. A directória da "
-#~ "preferência \"{0}\" não é uma directória."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html> Falhou a inicialização das preferências.<br>A directória da "
-#~ "preferência \"{0}\" não é uma directória.</html>"
-
-#~ msgid "Text"
-#~ msgstr "Texto"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} objecto a modificar:"
-#~ msgstr[1] "{0} objectos a modificar:"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "trilha"
-#~ msgstr[1] "trilhas"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Existem conflitos não-resolvidos na camada ''{0}''.<br>Você precisa "
-#~ "resolvê-los primeiro.</html>"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Não consegui encontrar o objeto de id {0} no dataset atual"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>O envio <strong>falhou</strong> porque você está usando<br>o "
-#~ "changeset {0} que já foi fechado em {1}.<br>Por favor envie novamente em "
-#~ "um changeset novo ou aberto.</html>"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Enviar dados para um changeset aberto"
-
-#~ msgid "underwater"
-#~ msgstr "subaquático"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Por favor digite uma latitude entre -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Por favor digite uma longitude válida entre -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Por favor digite uma latitude válida entre -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Por favor digite uma longitude entre -180..180"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Você está prestes a abrir {0} janelas do navegador.<br>Isso pode tanto "
-#~ "atravancar sua tela com janelas do navegador<br>quanto levar algum tempo "
-#~ "para terminar."
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Feche a janela de diálogo, não crie um novo nó"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Enviando {0} objetos..."
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Por favor digite um texto-filtro."
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Ativa/desativa visualização em tela cheia"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Visualização em tela cheia"
-
-#~ msgid "Travel"
-#~ msgstr "Viagem"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Indique se os dados devem ser baixados em uma nova camada"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Exige-se Id > 0, obtido {0}"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Erro de sintaxe do padrão: padrão {0} em {1} é ilegal!"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Número errado de parâmetros para o operador de tags"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Adicionado {0} objetos"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
-
-#~ 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 ""
-#~ "A(s) via(s) selecionadas têm nós selecionados fora da área a baixar.\n"
-#~ "Isto pode acabar apagando nós acidentalmente.\n"
-#~ "Deseja continuar?"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Somente o máximo de duas áreas podem ser unidas no momento."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" não está fechado e não pode ser unido."
-
-#~ msgid "Fix relations"
-#~ msgstr "Consertar relações"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Fundir área sobreposta consigo mesma"
-
-#~ msgid "Closed Way"
-#~ msgstr "Vía Fechada"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Não foi possível abrir o diretório.<br>Selecione um arquivo!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Abrindo {0} arquivos..."
-
-#~ 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] "A seleção contém {0} via. Tem certeza que quer simplificá-la?"
-#~ msgstr[1] ""
-#~ "A seleção contém {0} vias. Tem certeza que quer simplificar todas?"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Faltando parêntesis direito"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Valor incorreto para operador de etiquetas: {0}. Operador de tags espera "
-#~ "número de etiquetas ou intervalo, por exemplo, tags:1 ou tags:2-5"
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr ""
-#~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número "
-#~ "é esperado."
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Os dados copiados contem primitivas incompletas. Ao colar se apagarão as "
-#~ "primitivas incompletas. Deseja colar os dados sem as primitivas "
-#~ "incompletas?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Não foi possível desfazer comando ''{0}'' porque a camada ''{1}'' não "
-#~ "está mais presente"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Aviso: A camada ''{0}'' não existe mais. Não é possível remover conflito "
-#~ "para primitiva ''{1}''."
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>As relações {0} são cíclicas (uma refere-se à outra).<br>O JOSM não "
-#~ "pode enviar-las ao servidor. Por favor, edite estas relações e elimine a "
-#~ "dependência cíclica.</html>"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "{0} objetos eliminados"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Eliminado objeto ''{0}''"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Eliminando referência da relação {0}"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Ativar o flag \"modificado\" para via {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Ativar o flag \"modificado\" para relação {0}"
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Ativar o flag \"modificado\" para nó {0}"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parametro ''{0}'' > 0.0 esperado, obtido {1}"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Esperada matriz de comprimento 4, obtida {0}"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Erro: Linha ''{0}'' inesperada na lista de bookmarks do servidor"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Valor double ilegal ''{0}''"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Faltando alvo de mescla para objeto com id {0}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Esperado ID >= 0. Obtido {0}."
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "Uma primitiva com ID = 0 não pode ser invisível."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Esperado parâmetro ''{0}'' >= 0, obtido {1}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Esperado parâmetro ''{0}'' > 0, obtido {1}"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (France)"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Parâmetro ''{0}'' não pode estar vazio."
-
-#~ msgid "Apply also for children"
-#~ msgstr "Aplicar também para filhos"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Editar Rugby"
-
-#~ msgid "black"
-#~ msgstr "preto"
-
-#~ msgid "brown"
-#~ msgstr "marrom"
-
-#~ msgid "red"
-#~ msgstr "vermelho"
-
-#~ msgid "blue"
-#~ msgstr "azul"
-
-#~ msgid "gray"
-#~ msgstr "cinza"
-
-#~ msgid "white"
-#~ msgstr "branco"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr ""
-#~ "Impossível adicionar a primitiva {0} ao conjunto de dados porque ela já "
-#~ "está incluída"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
 #~ "O JOSM esperava encontrar a primitiva [{0} {1}] no conjunto de dados, mas "
-#~ "ela não está lá. Por favor reporte esse problema em http://josm."
-#~ "openstreetmap.de/. Esse não é um erro crítico e, com isso, deve ser "
-#~ "seguro continuar o seu trabalho."
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Aviso: o arquivo de revisão '/REVISION' não existe."
-
-#~ msgid "H"
-#~ msgstr "E"
-
-#~ msgid "M"
-#~ msgstr "FM"
-
-#~ msgid "C"
-#~ msgstr "F"
-
-#~ msgid "I"
-#~ msgstr "I"
+#~ "ela não está lá. Por favor reporte isso em http://josm.openstreetmap.de . "
+#~ "Esse não é um erro crítico e então deve ser seguro continuar com o seu "
+#~ "trabalho."
 
 #~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Não é possível designar um changesetId > 0 para um novo primitivo. Valor "
-#~ "do changesetId é {0}"
-
-#~ msgid "R"
-#~ msgstr "S"
-
-#~ msgid "A"
-#~ msgstr "A"
+#~ "<html>Será necessário <strong>múltiplos conjuntos de modificações</"
+#~ "strong> para enviar {0}objetos. Qual estratégia você quer usar?</html>"
 
 #~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: "
-#~ "{1}"
-
-#~ msgid "F"
-#~ msgstr "S"
-
-#~ msgid "D"
-#~ msgstr "R"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Não foi possível gravar favorito.<br>{0}</html>"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "Sistema geodésico UTM20 Norte"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Fotos não contêm informações de tempo."
-
-#~ msgid "The user name can't be empty. Please enter your OSM user name"
+#~ "Aviso: não foi possível abrir o fluxo de entrada do recurso ''/data/"
+#~ "{0}''. Não foi possível ler o grid NTF<->RGF93"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Abrir um editor para a restrição de conversão selecionada"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "O nome de usuário não pode ser vazio. Por favor digite o seu nome de "
-#~ "usuário no OSM"
-
-#~ msgid "Authorise JOSM to access the OSM API"
-#~ msgstr "Dê a permissão para o JOSM acessar a API do OSM"
-
-#~ msgid "OAuth authorisation failed"
-#~ msgstr "Falha na autorização OAuth"
-
-#~ msgid "Close the dialog and cancel authorisation"
-#~ msgstr "Fechar a caixa de diálogo e cancelar autorização"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Preferências do plugin WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "URL do WMS"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Diálogo não criado ainda. Invocar createInstance() primeiro"
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "A string ''{0}'' não é um valor double válido."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Clique para baixar a área selecionada atualmente"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Abrir"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Fechado"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ "Aviso: ignorando exceção porque tarefa foi cancelada. A exceção foi: {0}"
+
+#~ msgid ""
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Esperado valor inteiro > 0 para o parâmetro ''{0}'', recebido ''{1}''"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Digite o ID do changeset"
-
-#~ msgid "No, don't apply"
-#~ msgstr "Não, não aplique"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Comentário de envio inválido"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Selecione uma via simples e fechada de ao menos quatro nós."
-
-#~ msgid "Grid"
-#~ msgstr "Grade"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Dados com erros. Enviar assim mesmo?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Consertar erros selecionados."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorar erros selecionados na próxima vez."
+#~ "<html>Como alternativa você pode digitar o <strong>endereço de um tile</"
+#~ "strong> no formato <i>nível de zoom/x/y</i>, i.e. <i>15/256/223</i>. Os "
+#~ "endereços no formato <i>zoom,x,y</i> ou <i>zoom;x;y</i> também são "
+#~ "válidos.</html>"
 
 #~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Uma operação de envio e/ou salvamento em uma camada com "
+#~ "modificações<br>foi cancelada ou falhou.</html>"
+#~ msgstr[1] ""
+#~ "<html>Operações de envio e/ou salvamento de {0} camadas com "
+#~ "modificações<br>foram canceladas ou falharam.</html>"
+
+#~ msgid "Both"
+#~ msgstr "Ambos"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Corrigir endereços"
+
+#~ msgid ""
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Este teste verifica se não há vias com as mesmas etiquetas e mesmas "
-#~ "coordenadas de nós."
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" não está fechado e não pode ser unido."
+#~ "Substituir o plano de fundo original branco pela cor de plano de fundo "
+#~ "definida nas preferências do JOSM."
 
 #~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "<html>A camada ''{0}'' já se encontra em conflicto com a "
-#~ "primitiva<br>''{1}''.<br>Este conflito não pode ser adicionado.</html>"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
+#~ "(definir  \"{0}\"  para sim/não/perguntar nas preferências\n"
+#~ "para controlar o carregamento automático dos arquivos de calibração)"
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
 #~ msgstr ""
-#~ "<html>Não foi possível abrir diretório.<br>Por favor, selecione um "
-#~ "arquivo!</html>"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr "Mover nós para que todos ângulos sejam 90 ou 270 graus."
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Selecionar primitivas enviadas pelo usuário"
-
-#~ msgid "Download Object..."
-#~ msgstr "Baixar objeto..."
-
-#~ msgid "Download Object"
-#~ msgstr "Baixar objeto"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Ajustar a posição da camada WMS selecionada"
-
-#~ msgid "Man-Made"
-#~ msgstr "Construção humana"
+#~ "Também, a partir de agora, os arquivos cal irão ser carregados "
+#~ "automaticamente."
 
 #~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "<b>Zoom:</b> Roda do mouse, clique duplo ou Ctrl + Up/Down <b>Mover mapa:"
-#~ "</b> Segure o botão direito do mouse e mova-o ou use as setas do teclado. "
-#~ "<b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a área."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Aviso: Camada \"{0}\" já não existe mais. Não foi possível remover a "
-#~ "primitiva \"{1}\"."
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Digite um comentário de envio (mín. de 3 caracteres)"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} conflito ainda não foi resolvido.<br><br>Por favor, abra a janela de "
-#~ "Lista de Conflitos e resolva-o manualmente."
-#~ msgstr[1] ""
-#~ "{0} conflitos ainda não foram resolvidos.<br><br>Por favor, abra a janela "
-#~ "de Lista de Conflitos e resolva-os manualmente."
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Não decidir conflito entre diferentes estados de visibilidade"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto "
-#~ "com versão menor {2} não é visível. Não é possível lidar com essa "
-#~ "inconsistência. Mantendo objeto alvo. "
-
-#~ msgid ""
-#~ "Following primitives could not be added because they are deleted: {0}"
-#~ msgstr ""
-#~ "As primitivas seguintes não puderam ser adicionadas porque foram "
-#~ "deletadas: {0}"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Baixe e mostre o histórico das primitivas selecionadas"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Selecione primitivas para as relações de membros selecionadas"
-
-#~ msgid "Use all mine elements"
-#~ msgstr "Usar todos meus elementos"
-
-#~ msgid "Use all their elements"
-#~ msgstr "Usar todos elementos deles"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Recuperar {0} primitiva"
-#~ msgstr[1] "Recuperar {0} primitivas"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Erro: Valor real ilegal \"{0}\" na linha \"{1}\" na lista de favoritos do "
-#~ "servidor"
-
-#~ msgid "tower"
-#~ msgstr "torre"
-
-#~ msgid "line"
-#~ msgstr "linha de transmissão"
-
-#~ msgid "any substance"
-#~ msgstr "qualquer substância"
-
-#~ msgid "Edit Football"
-#~ msgstr "Editar Futebol Americano"
-
-#~ msgid ""
-#~ "Cannot open {0} file with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgstr[0] ""
-#~ "Não é possível abrir arquivo {0} com o importador de arquivos \"{1}\". "
-#~ "Pulando os seguintes arquivos:"
-#~ msgstr[1] ""
-#~ "Não é possível abrir os arquivos {0} com o importador de arquivos "
-#~ "\"{1}\". Pulando os seguintes arquivos:"
-
-#~ msgid "<number>"
-#~ msgstr "<número>"
-
-#~ msgid "Use all my elements"
-#~ msgstr "Use todos os meus elementos"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Selecionar camada WMS"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplicar vias com um Offset"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Mostrar imagens de fundo do OpenLayers"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Você está a ponto de apagar nós fora da área que fez download de dados."
-#~ "<br> Isto pode causar problemas, já que outros objetos que você não pode "
-#~ "ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Aproximar dos primitivos do conteúdo deste changeset na camada de dados "
-#~ "atual"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr ""
-#~ "Aproximar-se dos primitivos correspondentes na camada de dados atual"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Ponto de Hidrovia"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 "
-#~ "caracteres)"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "As seguintes primitivas não puderam ser copiadas para a primitiva "
-#~ "destino<br>porque elas estão apagadas no conjuntos de dados destino:"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "GPS point"
-#~ msgstr "Pontos GPS"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Habilitar padrões embutidos"
-
-#~ msgid "Used style"
-#~ msgstr "Estido em uso"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Estilos disponíveis (de {0})"
-
-#~ msgid "Icon paths"
-#~ msgstr "Caminho dos ícones"
-
-#~ msgid "load data from API"
-#~ msgstr "ler dados da API"
-
-#~ msgid "create new objects"
-#~ msgstr "criar novos objetos"
-
-#~ msgid "change the selection"
-#~ msgstr "mudar a seleção"
-
-#~ msgid "change the viewport"
-#~ msgstr "mudar a exibição"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "confirmar todas as ações do Controle Remoto manualmente"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "Um plugin que permite que o JOSM seja controlado a partir de outros "
-#~ "programas."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Configurações do plugin de Controle Remoto."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "O plugin de Controle Remoto vai sermpre ouvir na porta 8111 em localhost. "
-#~ "A porta não está disponível porque ela está sendo referenciada por uma "
-#~ "aplicação externa."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Ações permitidas"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Modifica a lista de servidores WMS exibidos no menu do plugin WMS"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "URL do WMS (Padrão)"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Digite o nome do menu e a URL do WMS"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Copiar o(s) padrão(ões) selecionados"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Inserir objetos 'via' da área de transferência"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Combinação tag/valor ilegal"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Falha ao mesclar primitivos removidos"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Remove todos os membros referentes ao um dos primitivos selecionados"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Preparando para enviar primitivos ..."
-
-#~ msgid "No username provided."
-#~ msgstr "Não foi informado o nome de usuário."
-
-#~ msgid "No password provided."
-#~ msgstr "Não foi informado a senha."
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rotação da grade"
-
-#~ msgid "Grid layout"
-#~ msgstr "Layout da grade"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Camada da grade:"
-
-#~ msgid "Add grid"
-#~ msgstr "Adicionar grade"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} consiste em {1} trilha"
-#~ msgstr[1] "{0} consiste em {1} trilhas"
-
-#~ msgid "image "
-#~ msgstr "imagem "
-
-#~ msgid "Image not created properly."
-#~ msgstr "A imagem não foi criada de forma apropriada."
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Para manter a versão local, o JOSM<br>precisa resetar o id do "
-#~ "primitivo {0} para zero.<br>No próximo envio o servidor irá "
-#~ "designar<br>um novo id para ele.<br>De acordo?</html>"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Existe {0} primitivo adicional referenciado pela relação {1}<br>que foi "
-#~ "removido no servidor.<br><br>Você quer desfazer a remoção deste primitivo "
-#~ "também?"
-#~ msgstr[1] ""
-#~ "Existem {0} primitivos adicionais referenciados pela relação {1}<br>que "
-#~ "foram removidos no servidor.<br><br>Você quer desfazer a remoção destes "
-#~ "primitivos também?"
-
-#~ msgid "tagged"
-#~ msgstr "etiquetado"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "É obrigatório ter em uma restrição de conversão um caminho OSM com a "
-#~ "regra <tt>to</tt>."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "É obrigatório ter em uma restrição de conversão um caminho OSM com a "
-#~ "regra <tt>from</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Esta restrição de conversão usa o caminho do OSM <span class=\"object-name"
-#~ "\">{0}</span> com a regra <tt>from</tt> <strong>e</strong> com a regra "
-#~ "<tt>to</tt>. Em uma restrição de conversão, o caminho com a regra "
-#~ "<tt>from</tt> deve ser diferente do caminho com a regra <tt>to</tt>."
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Aviso: falha ao analisar estilos Mappaint de ''{0}''. A exceção foi: {1}"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Uma exceção ocorreu"
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Filtro Oculto: {0} Desabilitado: {0}"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Baixar imagens WMS do {0}"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>A relação filha<br>{0}<br>foi deletada no servidor. Ela não pode "
-#~ "ser carregada."
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Selecionar membros da relação que referenciam primitivas na seleção atual"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Selecionar membros da relação que referenciam {0} primitivas na seleção "
-#~ "atual"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Essa relação já tem um ou mais membros se referindo à<br>primitiva "
-#~ "\"{0}\"<br><br>Você realmente deseja adicionar outro membro à relação?</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>A camada \"{0}\" já tem um conflito para a primitiva<br>\"{1}\"."
-#~ "<br>Por favor, primeiro resolva esse conflito e então tente de novo.</"
-#~ "html>"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Você está escolhendo um papel vazio em {0} primitiva."
-#~ msgstr[1] "Você está escolhendo um papel vazio em {0} primitivas."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Isso é igual a remover os papéis dessas primitivas."
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Nem <strong>{0}</strong> nem <strong>{1}</strong> estão ativos."
-#~ "<br>Por favor, escolha baixar dados do OSM, ou dados GPX ou ambos.</html>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Juntas Áreas: Remover Caminhos Curtos"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Carregue um segmento de caminho para criar um retângulo. Ctrl-carregar "
-#~ "para mover um segmento sobre sua normal."
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Aviso: Limpando caminho {0}  porque o número de nós reduziu para abaixo "
-#~ "de 2. Atualmente é {1}"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Estilo para caminho externo \"{0}\" contém erros."
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Existe {0} nó adicional usado pelo caminho {1}<br>que está apagado no "
-#~ "servidor.<br><br>Você quer recuperar este nó também?"
-#~ msgstr[1] ""
-#~ "Existem {0} nós adicionais usados pelo caminho {1}<br>que estão apagados "
-#~ "no servidor.<br><br>Você quer recuperar estes nós também?"
-
-#~ msgid "Active styles"
-#~ msgstr "Estilos ativos"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Conteúdo de ajuda para o tópico não "
-#~ "existe</p><p class=\"warning-body\">O conteúdo do tópico de ajuda <strong>"
-#~ "{0}</strong> ainda não está disponível. Ele está faltando tanto na sua "
-#~ "língua local ({1}) como em inglês.<br><br>Por favor ajude a melhorar o "
-#~ "sistema de ajuda do JOSM inserindo a informação que está faltando. Você "
-#~ "pode tanto editar o <a href=\"{2}\">tópico de ajuda no seu idioma ({1})</"
-#~ "a> ou o <a href=\"{3}\">tópico de ajudo em inglês</a>.</p></html>"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Para manter sua versão local, o JOSM<br>tem que resetar o ID da "
-#~ "primitiva {0} para zero.<br>Na próximo envio, o servidor vai "
-#~ "atribuir<br>um novo ID.<br>Você concorda?</html>"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Manter arquivos de backup"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Por favor digite o seu nome de usuário e senha do OSM. A senha "
-#~ "<strong>não</strong> será salva em texto puro nas preferências do JOSM, e "
-#~ "será enviada ao servidor do OSM <strong>apenas uma vez</strong>. "
-#~ "Requisições de envio posteriores não usarão mais a sua senha."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Cuidado:</strong> A senha é transferida <strong>apenas uma vez</"
-#~ "strong> em texto puro para o website do OSM. <strong>Não use</strong> uma "
-#~ "senha importante até que o servidor do OSM disponibilize um canal de "
-#~ "comunicação encriptado (HTTPS)."
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Especificado ID inválido. Não é possível baixar objeto."
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Por favor selecionea camada WMS para ajustar."
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Atualmente não há nenhuma camada WMS para ajustar."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Você está a ponto de apagar objetos incompletos. <br> Isto irá causar "
-#~ "problemas porque você não enxerga o objeto real. <br>Está seguro que quer "
-#~ "apagar?"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Mostra imagens georeferenciadas como fundo no JOSM (servidores WMS, "
-#~ "Yahoo, ...)."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Permite que outros aplicativos enviem comandos para o JOSM."
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr ""
-#~ "Não foi possível ler os dados osm salvados automaticamente ({0}) - {1}"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM encontrado {0} camadas de dados osm não salvos. Possivelmente o JOSM "
-#~ "caiu na última vez. Você quer restaurar os dados?"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Aviso: primitiva \"{0}\" já está excluída do servidor. Ignorando esta "
-#~ "primitiva e repetindo o upload."
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Adicione um nome de arquivo ou um URL de um estilo ativo"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Projeção \"{0}\" não encontrada"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Por favor, selecione ao menos dois nós para unir ou nodos que esteja "
-#~ "fechados com outro nó."
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr "Conflito no atributo \"visível\" para objeto do tipo {0} com id {1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Tipo de objeto {0} com id {1} está marcado para ser apagado, mas está "
-#~ "faltando na definição de dados fonte."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Não é possível corresponder o link inserido ou o id para o serviço "
-#~ "selecionado. Por favor, tente novamente."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Este teste encontra objetos multi-poligonais cujo atributo \"nome\" não é "
-#~ "igual a algum atributo \"name:*\" e não é uma composição do atributo "
-#~ "\"name:*\". Ex: Itália - Italien - Italy"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Nós sem etiquetas e desconectados"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Parece que o JOSM fechou se modo inapropriado da última vez. Deseja "
-#~ "restaurar os dados?"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Iniciar navegador com a ajuda do wiki para objetos selecionados"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>A URL base<br>''{0}''<br>para esta camada WMS não termina com ''&'' "
-#~ "e nem com um ''?''.<br>Isto indica uma requisição WMS inválida. Você deve "
-#~ "verificar as suas<br>configurações de preferências.<br>Você gostaria de "
-#~ "obter os quadros WMS mesmo assim?"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Camada WMS sem nome"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "A camada não tem suporte a qualquer uma das projeções do JOSM,\n"
-#~ "você não poderá usá-lá. Esta mensagem não irá ser exibida novamente."
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Permitir alterar o rótulo dos pontos da via na trilha."
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Migração de configuração do WMSPlugin/SlippyMap"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Mínimo de ampliação lvl: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Máximo de ampliação lvl: "
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Migração de configurações do Imagery: conflito ao mover propriedade {0} -"
-#~ "> {1}"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr ""
-#~ "Migração de configurações do Imagery: conflito ao mover array {0} -> {1}"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "Há {0} configurações WMSPlugin desconhecidas"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "Há {0} configurações do plug-in do slippymap desconhecidas"
-
-#~ msgid "Keep current list"
-#~ msgstr "Manter lista atual"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Sobrescrever com lista WMSPlugin"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Manter configurações atuais"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Sobrescrever com configurações WMSPlugin"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Sobrescrever com configurações SlippyMap"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Lista de camada WMS:"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Configurações WMSPlugin:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Configurações SlippyMap:"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Migração de configurações do Imagery"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Aviso: conflito de configurações inesperado"
-
-#~ msgid "import data from URL"
-#~ msgstr "importar dados para URL"
-
-#~ msgid "load imagery layers"
-#~ msgstr "carregar camadas imagery"
-
-#~ msgid "read protocol version"
-#~ msgstr "ler versão do protocolo"
-
-#~ msgid "Settings for the Remote Control freature."
-#~ msgstr "Configurações para o recurso de Controle Remoto."
-
-#~ msgid ""
-#~ "JOSM will always listen on port 8111 on localhost.The port is not "
-#~ "configurable because it is referenced by external applications talking to "
-#~ "JOSM."
-#~ msgstr ""
-#~ "O JOSM irá sempre ouvir na porta 8111 localmente. A porta não é "
-#~ "configurável pelo fato de ser referenciada por aplicativos externos que "
-#~ "se comunicam com o JOSM."
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Estilos disponíveis (de {0}):"
-
-#~ msgid "Internal style"
-#~ msgstr "Estilo interno"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Aviso: sem preferências \"{0}\" encontradas."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "O servidor respondeu com um código de resposta 404, tentando novamente "
-#~ "com uma requisição individual para cada primitivo."
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Aviso: A URL base \"{0}\" para um serviço WMS não possui um '&' perdido "
-#~ "ou um '?'."
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "substituído pelo plugin {0}"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Alterar propriedade de 1 objeto"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr ""
-#~ "Você tem {0} elementos selecionados. Mas você pode editar somente um "
-#~ "elemento!"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr "Não use relação para endereços (mas \"addr:street\" nos elementos)."
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "A projeção atual está definida para {0}"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Por favor, ajuste a camada WMS manualmente usando objetos exatos "
-#~ "conhecidos/traços/... antes de iniciar o mapa."
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "set {0}"
-#~ msgstr "definir {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "definir projeção de {0} para {1}"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Simplificar área (remover {0} nó)"
-#~ msgstr[1] "Simplificar área (remover {0} nós)"
-
-#~ msgid "No colour"
-#~ msgstr "Sem cores"
-
-#~ msgid "White"
-#~ msgstr "Branco"
-
-#~ msgid "Red"
-#~ msgstr "Vermelho"
-
-#~ msgid "Orange"
-#~ msgstr "Laranja"
-
-#~ msgid "Amber"
-#~ msgstr "Âmbar"
-
-#~ msgid "Yellow"
-#~ msgstr "Amarelo"
-
-#~ msgid "Green"
-#~ msgstr "Verde"
-
-#~ msgid "Blue"
-#~ msgstr "Azul"
-
-#~ msgid "Violet"
-#~ msgstr "Violeta"
-
-#~ msgid "Black"
-#~ msgstr "Preto"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Tecla de atalho duplicada para botão \"{0}\" - botão será ignorado!"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% de faixas GPS"
-
-#~ msgid "farmland"
-#~ msgstr "terra cultivada"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "Digite as coordenadas para o novo nó.<br/>Você pode separar longitude e "
-#~ "latitude com espaço, vírgula ou ponto e vírgula.<br/>Use números "
-#~ "positivos ou N, E caracteres para indicar as direções cardeais Norte ou "
-#~ "Leste.<br/>Para as direções cardeais Sul e Oeste você pode usar tanto "
-#~ "números negativos como os caracteres S e W.<br/>Os valores das "
-#~ "coordenadas podem ser em uma destes três formatos:<ul><li><i>graus</"
-#~ "i><tt>&deg;</tt></li><li><i>graus</i><tt>&deg;</tt> <i>minutos</"
-#~ "i><tt>&#39;</tt></li><li><i>graus</i><tt>&deg;</tt> <i>minutos</"
-#~ "i><tt>&#39;</tt> <i>segundos</i><tt>&quot</tt></li></ul>Símbolos <tt>&deg;"
-#~ "</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</"
-#~ "tt> são opcionais.<br/><br/>Alguns exemplos:<ul><li>49.29918&deg; "
-#~ "19.24788&deg;</li><li>N 49.29918 E 19.24788</li><li>W 49&deg;29.918&#39; "
-#~ "S 19&deg;24.788&#39;</li><li>N 49&deg;29&#39;04&quot; E "
-#~ "19&deg;24&#39;43&quot;</li><li>49.29918 N, 19.24788 E</"
-#~ "li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</li><li>49 29 "
-#~ "51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Escala do pixel: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Zoom atual: {0}"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Melhor zoom: {0}"
-
-#~ msgid "remove entry"
-#~ msgstr "remover entrada"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "O que se segue são resultados de uma validação automatizada. Tente "
-#~ "corrigi-los, mas tome cuidado (não destrua dados válidos). Quando em "
-#~ "dúvida, ignore.<br>Se você cancelar esta mensagem, você pode encontrar "
-#~ "estas entradas no painel lateral do validador, para verificá-los."
+#~ "Definir  \"{0}\"  para sim/não/perguntar nas preferências\n"
+#~ "para controlar o carregamento automático dos arquivos de calibração."
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Dados suspeitos. Enviar mesmo assim?"
+
+#~ msgid "unkown"
+#~ msgstr "desconhecido"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 26529)
+++ applications/editors/josm/i18n/po/ru.po	(revision 26530)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-26 18:31+0000\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-07 15:55+0000\n"
 "Last-Translator: Nkolay Parukhin <parukhin@gmail.com>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -18,6 +18,6 @@
 "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: 2011-07-31 11:42+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:40+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -25,5 +25,5 @@
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -38,12 +38,12 @@
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Некорректный файловый URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -98,6 +98,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -121,15 +122,15 @@
 msgstr "Предупреждение"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Параметр \"downloadgps\" не может использовать имена файлов или файловые URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Некорректный URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -142,13 +143,13 @@
 "раннюю версию JOSM (совместимую с Java 5).</li></ul>Больше информации:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Выйти из JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Все равно продолжить"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -168,7 +169,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -178,6 +179,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -208,5 +209,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -394,6 +395,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -420,5 +421,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -426,7 +427,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -434,5 +436,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -464,10 +466,10 @@
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr ""
-"Пожалуйста, выберите по крайней мере одну уже загруженную на сервер точку, "
+"Пожалуйста, выберите, по крайней мере одну, уже загруженную на сервер точку, "
 "линию или отношение."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62
 msgid "Please select the target layer."
-msgstr "Пожалуйста выберите целевой слой."
+msgstr "Пожалуйста, выберите целевой слой."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:66
@@ -645,5 +647,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -781,5 +783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
-msgstr "Скачиваение открытых пакетов правок ..."
+msgstr "Скачивание открытых пакетов правок ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -902,5 +904,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1092,6 +1094,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1242,5 +1244,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1477,6 +1479,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -1546,4 +1548,6 @@
 "again."
 msgstr ""
+"Невозможно сопоставить введённую ссылку или id с выбранным сервисом. "
+"Пожалуйста, попробуйте снова."
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
@@ -1573,5 +1577,5 @@
 "node."
 msgstr ""
-"Пожалуйста, выберите как минимум 2 точки или точку, близко расположеную к "
+"Пожалуйста, выберите как минимум 2 точки или точку, близко расположенную к "
 "другой."
 
@@ -1604,5 +1608,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected objects into another layer"
-msgstr "Объединить выбраные объекты в другой слой"
+msgstr "Объединить выбранные объекты в другой слой"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1790,6 +1794,6 @@
 "углы станут 90 или 180 градусов.</h3>Вы можете выделить две дополнительные "
 "точки. Тогда направление будет сориентировано в соответствии с этими "
-"точками. (Позже, вы можете отменить передвижение некоторых точек:<br>Вы "
-"берите их и нажмите  грячие клавиши Ортогонализовать / Отменить. По "
+"точками. (Позже, вы можете отменить передвижение некоторых точек:"
+"<br>Выберите их и нажмите  горячие клавиши для Ортогонализовать/Отменить. По "
 "умолчанию это Shift-Q.)"
 
@@ -2016,5 +2020,5 @@
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr "Не возможно переименовать файл ''{0}''"
+msgstr "Невозможно переименовать файл ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54
@@ -2161,5 +2165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2198,5 +2202,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
 msgid "Cancel operation"
-msgstr "Отменить опрацию"
+msgstr "Отменить операцию"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
@@ -2321,7 +2325,7 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>Роль, основанная на участии в отношениях была скопирована во все новые "
-"линии.<br>Результат необходимо проверить и исправить, если потребуется.</"
-"html>"
+"<html>Роль, основанная на участии в отношениях, была скопирована во все "
+"новые линии.<br>Результат необходимо проверить и исправить, если потребуется."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:452
@@ -2484,7 +2488,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Скачать данные"
@@ -2741,7 +2745,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Игнорирование ошибки, так как скачивание было отменено. Текст ошибки: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2886,10 +2889,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3017,5 +3020,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:128
 msgid "Make parallel copies of ways"
-msgstr "Создаёт параллельные копий линий"
+msgstr "Создаёт параллельные копии линий"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:187
@@ -3064,5 +3067,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3124,5 +3127,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:675
 msgid "Release the mouse button to stop scaling."
-msgstr "Отпустите кнопку мыши чтобы завершить масштабирование"
+msgstr "Отпустите кнопку мыши, чтобы завершить масштабирование"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:677
@@ -3132,7 +3135,7 @@
 msgstr ""
 "Перемещение объектов перетаскиванием; Нажмите Shift для добавление к уже "
-"выбранным объектам (Ctrl to toggle); Shift-Ctrl - для вращения выбранных "
-"объектов; Alt-Ctrl - для изменения масштаба выбранных объектов; или для "
-"изменения выбранного"
+"выбранным объектам (Ctrl для переключения); Shift-Ctrl - для вращения "
+"выбранных объектов; Alt-Ctrl - для изменения масштаба выбранных объектов; "
+"или для изменения выбранного"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
@@ -3289,6 +3292,6 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
-"<b>type:</b>object_type, где object_type - <b>node</b>(точка), <b>way</b>"
-"(линия), <b>relation</b>(отношение)"
+"<b>type:</b> - тип объекта  (<b>node</b>(точка), <b>way</b>(линия), "
+"<b>relation</b>(отношение))"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
@@ -3578,5 +3581,5 @@
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
-"Предупреждение: автоматическое усечение значение тега ''{0}'' на удалёном "
+"Предупреждение: автоматическое усечение значение тега ''{0}'' на удалённом "
 "объекте {1}"
 
@@ -3640,7 +3643,7 @@
 msgstr ""
 "Ниже приведены результаты автоматической проверки. Попробуйте эти "
-"исправления, но будьте осторожны(не уничтожьте правильные данные). Если вы "
+"исправления, но будьте осторожны (не уничтожьте правильные данные). Если вы "
 "сомневаетесь - проигнорируйте их.<br>После закрытия этого диалогового окна, "
-"вы можете найти записи проверки на боковой панели для уточения их состояния."
+"вы можете найти записи проверки на боковой панели для уточнения их состояния."
 
 #. * Error messages
@@ -3681,6 +3684,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Найдены подозрительные данные. Всё равно выгрузить?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3731,40 +3734,40 @@
 msgstr "Изменены точки для {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Удалить \"{0}\" для точки ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Удалить \"{0}\" для линии ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Удалить \"{0}\" для отношения ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Задать {0}={1} для точки ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Задать {0}={1} для линии ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Задать {0}={1} для отношения ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Удалить \"{0}\" для {1} объектов"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3896,4 +3899,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Удалить подтверждение"
@@ -4100,5 +4104,5 @@
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr "Невозможно содать файл {0}. Будет использовано другое имя файла"
+msgstr "Невозможно создать файл {0}, будет использовано другое имя файла"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:153
@@ -4217,9 +4221,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Предупреждение: Ошибка инициализации настроек. Не удалось сбросить файл "
-"настроек {0} к состоянию по умолчанию."
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4255,8 +4257,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Предупреждение: неожиданный номер версии JOSM в файле исправлений, значение: "
-"''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4319,5 +4319,5 @@
 #: ../core/src/org/openstreetmap/josm/data/imagery/GeorefImage.java:90
 msgid "Not in cache"
-msgstr "Не в кеше"
+msgstr "Не в кэше"
 
 #: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76
@@ -4363,10 +4363,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM ожидал найти элемент [{0} {1}] в наборе данных, но его там нет. "
-"Пожалуйста, сообщите об этом на http://josm.openstreetmap.de . Это не "
-"критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4377,5 +4374,5 @@
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr "Отстутствует результат слияния для линии с id {0}"
+msgstr "Отсутствует результат слияния для линии с id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:182
@@ -4392,5 +4389,5 @@
 #, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr "Отстутствует результат слияния для точки с id {0}"
+msgstr "Отсутствует результат слияния для точки с id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:262
@@ -4399,5 +4396,5 @@
 #, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr "Отстутствует результат слияния для отношения с id {0}"
+msgstr "Отсутствует результат слияния для отношения с id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:267
@@ -4471,5 +4468,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4489,8 +4486,8 @@
 msgstr "мультиполигон"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4581,5 +4578,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
 msgid "Relation: selected"
-msgstr "Отношения: выделеные"
+msgstr "Отношения: выделенные"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
@@ -4637,52 +4634,64 @@
 msgstr "Географическая WGS84"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Предупреждение: не удалось открыть входящий поток для ресурса ''/data/{0}''. "
-"Невозможно загрузить решётку NTF<->RGF93"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} на {2} град.)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Корсика)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Зона Lambert CC"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Зона (Эстония)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Проекция Меркатора"
@@ -4711,81 +4720,101 @@
 "для кода \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Польша)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Зона PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Польша))"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "Зона PUWG 2000 {0} (Польша)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарская проекция"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (TM Латвии)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Зона UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Север"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Юг"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Полушарий"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Смещение 3.000.000 м на восток"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Гвиана RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "Франция UTM (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "Система координат UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4861,5 +4890,5 @@
 msgstr ""
 "Этот тест проверяет, соединены ли в точке пересечения две дороги "
-"(автомобильные, железные, водные) или два здания если они расположены в "
+"(автомобильные, железные, водные) или два здания, если они расположены в "
 "одном и том же слое."
 
@@ -4944,5 +4973,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
 msgid "Duplicated relations."
-msgstr ""
+msgstr "Повторяющиеся отношения."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:139
@@ -4951,5 +4980,5 @@
 "with same roles."
 msgstr ""
-"Проверяет на наличие отношений с одиннаковыми тегами, членами и их ролями."
+"Проверяет на наличие отношений с одинаковыми тегами, членами и их ролями."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:159
@@ -4959,5 +4988,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:168
 msgid "Relations with same members"
-msgstr "Отношения с одиннаковыми членами"
+msgstr "Отношения с одинаковыми членами"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:251
@@ -4974,6 +5003,6 @@
 "optionally also same tags."
 msgstr ""
-"Проверяет на наличие линий с одиннаковыми координатами точек и (опционально) "
-"с оданнаковыми тегами."
+"Проверяет на наличие линий с одинаковыми координатами точек и (опционально) "
+"с одинаковыми тегами."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:105
@@ -5011,45 +5040,45 @@
 msgstr "Этот тест проверяет корректность мультиполигонов"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Линия стиля \"область\" не замкнута"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "У мультиполигона отсутствует внешняя линия"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Нет стиля для мультиполигона"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "В отношении мультиполигон не задан стиль"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Стиль внутренней линии - мультиполигон"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Несоответствие стиля для внешней линии"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Мультиполигон не замкнут"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Внутренняя линия мультиполигона находится за его пределами"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Пересечение между линиями мультиполигона"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Роль для участника мультиполигона задана неудачно"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Не-линия в мультиполигоне"
@@ -5065,4 +5094,7 @@
 "e.g., Italia - Italien - Italy."
 msgstr ""
+"Этот тест находит многоязычные объекты чьи атрибуты ''name'' не совпадают с "
+"атрибутом ''name:*'' и не состоят из атрибутов  ''name:*'', например, Italia "
+"- Italien - Italy."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:47
@@ -5321,5 +5353,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5344,5 +5376,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5353,5 +5385,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5766,5 +5798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5833,5 +5865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "дорога"
@@ -5839,5 +5871,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5845,10 +5877,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "водоём"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "землепользование"
@@ -5858,5 +5890,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5871,5 +5903,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5883,5 +5915,5 @@
 msgstr "общественный транспорт"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6253,5 +6285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6362,4 +6394,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6465,5 +6498,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6508,11 +6541,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Как альтернативу, вы можете ввести <strong>адрес квадрата</strong> для "
-"отдельного квадрата в формате <i>zoomlevel/x/y</i>, например: <i>15/256/223</"
-"i>. Адреса квадратов в формате <i>zoom,x,y</i> или <i>zoom;x;y</i> тоже "
-"корректны.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6596,5 +6625,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:29
 msgid "Conflict foreground: in comparison"
-msgstr "Конфликт переднего плана: по сравненю"
+msgstr "Конфликт переднего плана: в сравнении"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:30
@@ -6608,5 +6637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:33
 msgid "Conflict background: not in opposite"
-msgstr "Конфликт фона: не противополоен"
+msgstr "Конфликт фона: не противоположен"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:34
@@ -6690,7 +6719,7 @@
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "Предстоит уладить {0} отложенный кофликт тегов"
-msgstr[1] "Предстоит устранить {0} отложенных кофликта тегов"
-msgstr[2] "Предстоит уладить {0} отложенных кофликта тегов"
+msgstr[0] "Предстоит уладить {0} отложенный конфликт тегов"
+msgstr[1] "Предстоит устранить {0} отложенных конфликта тегов"
+msgstr[2] "Предстоит уладить {0} отложенных конфликтов тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:183
@@ -6770,5 +6799,5 @@
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
-msgstr "Список в роли {0} в настоящий момент не учавствует в сравнении пары."
+msgstr "Список в роли {0} в настоящий момент не участвует в сравнении пары."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:799
@@ -6807,9 +6836,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Список объединённых элементов. Они заменят Мои элементы когда решение об "
-"объединении будет принято."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -7059,10 +7086,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Оставить мои координаты"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Оставить их координаты"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7120,6 +7147,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7141,6 +7168,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7260,5 +7287,5 @@
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr "Значение ''{0}'' будет присовено ключу ''{1}''"
+msgstr "Значение ''{0}'' будет присвоено ключу ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:108
@@ -7270,5 +7297,5 @@
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr "Все присоединённые значения ''{0}'' будут присовены ключу ''{1}''"
+msgstr "Все присоединённые значения ''{0}'' будут присвоены ключу ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
@@ -7554,5 +7581,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7797,5 +7824,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -8020,7 +8047,37 @@
 msgstr "mapcss"
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr "неизвестный"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "неизвестно"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8139,5 +8196,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:803
 msgid "this layer is not currently active (click to activate)"
-msgstr "этот слой не является активным (щелкните чтобы его активировать)"
+msgstr "этот слой не является активным (щелкните, чтобы его активировать)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:919
@@ -8232,5 +8289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:601
 msgid "Built-in Style, internal path:"
-msgstr "Встроеный стиль, внутренний путь:"
+msgstr "Встроенный стиль, внутренний путь:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:603
@@ -8303,5 +8360,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8321,5 +8378,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8336,5 +8393,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Докачать с сервера участников выбранных отношений"
@@ -8342,5 +8399,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Докачать участников"
@@ -8380,8 +8437,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:422
 msgid "Call relation editor for selected relation"
-msgstr "Запустить редактор отношений для выделеного отношения"
+msgstr "Запустить редактор отношений для выделенного отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8389,5 +8446,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8456,5 +8513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:182
 msgid "Select objects submitted by this user"
-msgstr "Выбрать объекты, созданые этим пользователем"
+msgstr "Выбрать объекты, созданные этим пользователем"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
@@ -8529,9 +8586,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119
 msgid "Fix the selected issue."
-msgstr "Исправить выбраную проблему."
+msgstr "Исправить выбранную проблему."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:124
 msgid "Ignore the selected issue next time."
-msgstr "Игнорировать выбраную проблему в следующий раз."
+msgstr "Игнорировать выбранную проблему в следующий раз."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
@@ -8582,5 +8639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
 msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr "Прказать объекты, созданные, измененные или удаленные в пакете правок"
+msgstr "Показать объекты, созданные, измененные или удаленные в пакете правок"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:267
@@ -8589,5 +8646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8690,5 +8747,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Пользователь"
@@ -9689,5 +9745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9869,5 +9925,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9903,5 +9959,5 @@
 msgid "Remove the changeset in the detail view panel from the local cache"
 msgstr ""
-"Удалить из локального кеша пакет правок, указанный в панели подробного вида"
+"Удалить из локального кэша пакет правок, указанный в панели подробного вида"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
@@ -10021,4 +10077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Только мои пакеты правок"
@@ -10031,4 +10088,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Только пакеты правок пользователя с именем"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10097,5 +10160,5 @@
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-"Толкьо пакеты правок, закрытые после и открытые до указанной даты/времени"
+"Только пакеты правок, закрытые после и открытые до указанной даты/времени"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
@@ -10112,5 +10175,5 @@
 "specific time range.</html>"
 msgstr ""
-"<html>Пожалуйста, укажите правильные значения для даты/времени чтобы "
+"<html>Пожалуйста, укажите правильные значения для даты/времени, чтобы "
 "ограничить<br>запрос указанными временными рамками.</html>"
 
@@ -10150,5 +10213,5 @@
 "empty user name.</html>"
 msgstr ""
-"<html>Текущее значение это неверное имя пользователя.<br>Пожалуйста введите "
+"<html>Текущее значение это неверное имя пользователя.<br>Пожалуйста, введите "
 "непустое имя пользователя.</html>"
 
@@ -10172,5 +10235,5 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Пожалуйста, введите правильное время в обччном формате для вашего региона."
+"Пожалуйста, введите правильное время в обычном формате для вашего региона."
 "<br>Пример: {0}<br>Пример: {1}<br>Пример: {2}<br>Пример: {3}<br>"
 
@@ -10244,6 +10307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
 msgid "Download changesets using predefined queries"
-msgstr ""
-"Скачать с сервера пакеты правок,используя установленные правила запросов"
+msgstr "Скачать с пакеты правок, используя предопределённые запросы"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
@@ -10275,5 +10337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr "Пожалуйста, сначала введите правильную URL запроса пакета правок."
+msgstr "Пожалуйста, сначала введите правильный URL запроса пакета правок."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
@@ -10324,11 +10386,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr "Неправильная URL запроса пакета правок"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+msgstr "Неправильный URL запроса пакета правок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10338,13 +10400,13 @@
 msgstr[2] "Это изменит {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Пустое значение удаляет тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10357,18 +10419,19 @@
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Изменить значения?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr "Затереть клавишу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Заменить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10379,5 +10442,5 @@
 "Новая клавиша уже используется, хотите перезаписать значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10388,5 +10451,5 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10396,27 +10459,31 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Параметры/Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10425,62 +10492,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Расположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Удалить из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Открыть описание тега в OSM wiki (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
-msgstr "Открыть броузер с описанием wiki для выбраного объекта"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+msgstr "Открыть браузер с описанием wiki для выбранного объекта"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Выберите отношение в основном выборе."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Выбрать участников выделенных отношений"
@@ -10549,11 +10616,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Предупреждение: игнорирование ошибки, потому что задание отменено. Ошибка: "
-"{0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10580,11 +10647,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
-"Докачивание {0} дочернего элемента из {1} для родительских отношений"
 msgstr[1] ""
-"Докачивание {0} дочерних элементов из {1} для родительских отношений"
-msgstr[2] ""
-"Докачивание {0} дочерних элементов из {1} для родительских отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10943,11 +11006,4 @@
 msgstr "За время импорта произошло {0} конфликт(ов)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Предупреждение: Исключение проигнорировано, потому что задача отмнена. "
-"Ошибка: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10988,12 +11044,4 @@
 msgid "Load relation"
 msgstr "Скачать отношение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Предупреждение: игнорирование исключения потому что задание было отменено. "
-"Текст ошибки: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11044,6 +11092,6 @@
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
-"В настоящий момент вы не указали область для скачивания. Пожалуйста выберите "
-"её."
+"В настоящий момент вы не указали область для скачивания. Пожалуйста, "
+"выберите её."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
@@ -11140,5 +11188,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделеной области."
+msgstr "Пометьте, чтобы скачать с сервера треки GPS, для выделенной области."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:129
@@ -11210,5 +11258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102
 msgid "Choose the server for searching:"
-msgstr "Выберите поисковой сервер:"
+msgstr "Выберите поисковый сервер:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:110
@@ -11282,37 +11330,4 @@
 msgstr "Тип"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "неизвестно"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11347,5 +11362,5 @@
 "p><p class=\"warning-body\">Помощь для раздела <strong>{0}</strong> пока "
 "недоступна. Её нет как для вашего языка ({1}), так и на английском."
-"<br><br>Пожалуйста помогите улучшить справочную систему JOSM и добавить "
+"<br><br>Пожалуйста, помогите улучшить справочную систему JOSM и добавить "
 "недостающую информацию. Вы можете отредактировать как <a href=\"{2}\">раздел "
 "на вашем языке ({1})</a>, так и <a href=\"{3}\">английский вариант</a>.</p></"
@@ -11371,5 +11386,5 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
-"<html>Не удалось открыть страницу справки для url {0}.<br>Это скорее всего "
+"<html>Не удалось открыть страницу справки для url {0}.<br>Это, скорее всего, "
 "произошло из-за проблемы с сетью, пожалуйста, проверьте<br>ваше соединение с "
 "интернет</html>"
@@ -11445,20 +11460,20 @@
 msgstr "Координаты"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "История точки {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "История линии {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "История для отношения {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Скачать историю с сервера"
@@ -11554,6 +11569,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Пакет правок"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11764,5 +11779,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr "Комментарий пакета правок"
+msgstr "Комментарий пакета правок:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -11877,5 +11892,5 @@
 "and a valid password."
 msgstr ""
-"Идентификация OSM API ''{0}'' не удалась. Пожалуйста введите правильное имя "
+"Идентификация OSM API ''{0}'' не удалась. Пожалуйста, введите правильное имя "
 "пользователя и правильный пароль."
 
@@ -11901,5 +11916,5 @@
 "username and a valid password."
 msgstr ""
-"Идентификация на прокси HTTP ''{0}'' не удалась. Пожалуйста введите "
+"Идентификация на прокси HTTP ''{0}'' не удалась. Пожалуйста, введите "
 "правильное имя пользователя и правильный пароль."
 
@@ -11910,5 +11925,5 @@
 msgstr ""
 "Предупреждение: в зависимости от метода идентификации, пароль, который "
-"использует прокси сервер, может быть передан в незашифрованном виде."
+"использует прокси-сервер, может быть передан в незашифрованном виде."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:333
@@ -11932,5 +11947,5 @@
 msgstr ""
 "Невозможно получить список ваших открытых пакетов правок, потому что<br>JOSM "
-"не идентифицировал вас.<br>Либо вы работатаете анонимно, либо вам не "
+"не идентифицировал вас.<br>Либо вы работаете анонимно, либо вам не "
 "позволено<br>идентифицировать пользователя, от имени которого вы работаете."
 
@@ -12178,17 +12193,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Операция передачи на сервер и/или сохранения одного слоя с "
-"правками<br>была отменена или не удалась.</html>"
 msgstr[1] ""
-"<html>Операция передачи на сервер и/или сохранения {0} слоёв с "
-"правками<br>была отменена или не удалась.</html>"
-msgstr[2] ""
-"<html>Операция передачи на сервер и/или сохранения {0} слоёв с "
-"правками<br>была отменена или не удалась.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12546,5 +12554,5 @@
 "on the server ''{1}''."
 msgstr ""
-"Сервер сообщил, что текущий пакет правок был закрыт.<br>Это скорее всего "
+"Сервер сообщил, что текущий пакет правок был закрыт.<br>Это, скорее всего, "
 "произошло из-за того, что пакет правок достиг своего макс. размера,"
 "<br>составляющего {0} объектов на сервере ''{1}''."
@@ -12648,4 +12656,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12677,13 +12686,4 @@
 "запрос, потому что<br>превышен макс. размер пакета правок {1} на сервере "
 "''{2}''.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Необходимо <strong>несколько пакетов правок</strong>, чтобы передать "
-"на сервер {0} объектов. Какую стратегию вы выберете?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12720,5 +12720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
 msgid "Please enter an integer > 1"
-msgstr "Введите, пожалуйста целое значение > 1"
+msgstr "Пожалуйста, введите целое значение > 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422
@@ -12764,38 +12764,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Выбрать цвет"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "По умолчанию"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Выбор цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12807,9 +12807,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12817,26 +12817,26 @@
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Период"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Длина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Длина: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12846,8 +12846,8 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12857,12 +12857,12 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12872,10 +12872,10 @@
 msgstr[2] "{0} дорожек, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12886,78 +12886,78 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Загрузить возле:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "только трек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "только дорожные точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "треки и дорожные точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12968,11 +12968,11 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12982,6 +12982,6 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12991,27 +12991,27 @@
 "проигнорированы при расчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+msgstr "Настроить отрисовку трека"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
-msgstr "Маркеры из именованых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+msgstr "Маркеры из именованных точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Именованные точки трека из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Импортировать аудиофайлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -13024,29 +13024,29 @@
 "аудиоданными.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Импорт невозможен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудиофайлы Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудиомаркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Импорт изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -13159,5 +13159,5 @@
 msgstr "Обнаружены следующие проблемы:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13170,57 +13170,65 @@
 "Измените проекцию или удалите слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Автомасштабирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Автозагрузка квадратов"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Загрузить квадрат карты"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Показать данные квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Загрузить все квадраты карты"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Увеличить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Уменьшить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Привязаться к размеру квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
-msgstr "Очистить кеш квадратов карты"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+msgstr "Очистить кэш квадратов карты"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "приблизьте для загрузки квадратов"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "приблизьте для загрузки дополнительных квадратов"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
-msgstr "увеличьте маштаб для лучшей детализации"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+msgstr "увеличьте масштаб для лучшей детализации"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "Нет квадратов на данном масштабе"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr "Поддерживаются EPSG:4326 и проекция Меркатора"
@@ -13629,5 +13637,5 @@
 #, java-format
 msgid "Scanning directory {0}"
-msgstr "Скнирование каталога {0}"
+msgstr "Сканирование каталога {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
@@ -13777,10 +13785,10 @@
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "маркер GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13789,5 +13797,5 @@
 msgstr[2] "маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13797,22 +13805,22 @@
 msgstr[2] "{0} состоит из {1} маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
-"Нет существующих аудио маркеров на этом слое от корорых можно сделать сдвиг"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+"Нет существующих аудио маркеров на этом слое от которых можно сделать сдвиг"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Показать Текст/Пиктограммы"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Показать/скрыть текст и значки маркеров."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Синхронизировать аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13821,5 +13829,5 @@
 "синхронизации."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13827,14 +13835,14 @@
 msgstr "Аудио синхронизировано на точке {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Не удалось синхронизировать в воспроизводимом слое."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Установить маркер аудио на позиции проигрывания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13864,13 +13872,13 @@
 msgstr "Невозможно создать новый аудио-маркер."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Произошла ошибка при попытке показать URL для этого маркера"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(по ссылке: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Невозможно отобразить URL"
@@ -13900,11 +13908,11 @@
 "right click menu for details."
 msgstr[0] ""
-"Произошла ошибка при загрузки стиля. Подробности смотрите в пункте "
+"Произошла ошибка при загрузке стиля. Подробности смотрите в пункте "
 "\"Информация\" из контекстного меню."
 msgstr[1] ""
-"Произошло {0} ошибки при загрузки стиля. Подробности смотрите в пункте "
+"Произошло {0} ошибки при загрузке стиля. Подробности смотрите в пункте "
 "\"Информация\" из контекстного меню."
 msgstr[2] ""
-"Произошло {0} ошибок при загрузки стиля. Подробности смотрите в пункте "
+"Произошло {0} ошибок при загрузке стиля. Подробности смотрите в пункте "
 "\"Информация\" из контекстного меню."
 
@@ -14048,5 +14056,5 @@
 "outside<br>of JOSM.</html>"
 msgstr ""
-"<html>Введите маркер доступа вручную если он был создан и получен за "
+"<html>Введите маркер доступа вручную, если он был создан и получен за "
 "пределами <br>JOSM.</html>"
 
@@ -14059,7 +14067,7 @@
 msgstr ""
 "Пожалуйста, введите свой логин и пароль OSM. Пароль <strong>не будет</"
-"strong> сохранён открытым текстом в настройка JOSM и будет передан на сервер "
-"<strong>только 1 раз</strong>. Последующие загрузки данных больше не будут "
-"использовать пароль."
+"strong> сохранён открытым текстом в настройках JOSM и будет передан на "
+"сервер <strong>только 1 раз</strong>. Последующие загрузки данных больше не "
+"будут использовать пароль."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -14142,5 +14150,5 @@
 msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
-"Имя пользователя не может быть пустым. Пожалуйста введите Ваше имя "
+"Имя пользователя не может быть пустым. Пожалуйста, введите Ваше имя "
 "пользователя в OSM"
 
@@ -14152,5 +14160,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
 msgid "The password cannot be empty. Please enter your OSM password"
-msgstr "Пароль не может быть пустым. Пожалуйста введите Ваш OSM-пароль"
+msgstr "Пароль не может быть пустым. Пожалуйста, введите Ваш OSM-пароль"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:436
@@ -14184,5 +14192,5 @@
 msgstr ""
 "<html>Автоматический процесс извлечения маркера доступа OAuth <br>с сервера "
-"OSM не удался, потому что JOSM не смог построить<br>верную URL входа из URL "
+"OSM не удался, потому что JOSM не смог построить<br>верный URL входа из URL "
 "OAuth Authorize Endpoint ''{0}''.<br><br>Пожалуйста, проверьте ваши "
 "расширенные настройки и попытайтесь ещё раз.</html>"
@@ -14240,5 +14248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
-msgstr "Пожалуйста введите ключ маркера доступа"
+msgstr "Пожалуйста, введите ключ маркера доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
@@ -14246,5 +14254,5 @@
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
-"Ключ маркера доступа не должен быть пустым. Пожалуйста введите ключ маркера "
+"Ключ маркера доступа не должен быть пустым. Пожалуйста, введите ключ маркера "
 "доступа"
 
@@ -14356,5 +14364,5 @@
 msgid "Select to grant JOSM the right to upload map data on your behalf"
 msgstr ""
-"Выберите, чтобы позволить JOSM загружить данные карты на сервер от вашего "
+"Выберите, чтобы позволить JOSM загружать данные карты на сервер от вашего "
 "имени"
 
@@ -14366,5 +14374,5 @@
 msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
 msgstr ""
-"Выберите, чтобы позволить JOSM загружить треки GPS на сервер от вашего имени"
+"Выберите, чтобы позволить JOSM загружать треки GPS на сервер от вашего имени"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
@@ -14462,5 +14470,5 @@
 msgstr ""
 "<html>JOSM успешно извлёк маркер запроса. JOSM теперь откроет страницу "
-"авторизации во внешнем браузере. Пожалуйтса, войдите, используя имя "
+"авторизации во внешнем браузере. Пожалуйста, войдите, используя имя "
 "пользователя и пароль OSM и затем следуйте инструкциям, чтобы авторизовать "
 "маркер запроса. Затем переключитесь обратно в это окно и нажмите на <strong>"
@@ -14638,4 +14646,6 @@
 "so you can not use it. This message will not show again."
 msgstr ""
+"Этот слой не поддерживает ни одной проекции JOSM,\n"
+"вы не можете его использовать. Это сообщение больше показано не будет."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
@@ -14841,5 +14851,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr "Отношение времени диктофонной записи к истинно затраченому времени"
+msgstr "Отношение времени диктофонной записи к истинно затраченному времени"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
@@ -14932,83 +14942,84 @@
 msgstr "Цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Отображать стрелки направления"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Только в начале пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Отображать стрелки одностороннего движения"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Отображать порядковые номера сегментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Отображать границы скачанных данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Отображать виртуальные точки в режиме выбора"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Отображать неактивные слои другим цветом"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Сглаженные линии (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Рисовать только контур области"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Показывать направление на сегментах путей."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
-"Отображать стрелки для одностороннего движения и других направленых объектов."
+"Отображать стрелки для одностороннего движения и других направленных "
+"объектов."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показывать порядковые номера на всех сегментах линии."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Применить сглаживание карты."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Отображать границы области, скачанной с сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Отображать неактивные слои данных другим цветом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -15016,15 +15027,51 @@
 msgstr "Эта опция блокирует заполнение областей, несмотря на выбранный стиль."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Данные OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Авто"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Имя"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Описание"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Нет"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Использовать глобальные настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -15035,42 +15082,34 @@
 msgstr "Все"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Локальные файлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Нет"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
-msgstr "Отображать линии, даже если нет импортированых сегментов."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+msgstr "Отображать линии, даже если нет импортированных сегментов."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Отображать GPS большими точками"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
-"Изобразить значение HDOP (снижение точности в горизонтальной плоскости ) "
+"Изобразить значение HDOP (снижение точности в горизонтальной плоскости) "
 "окружностью."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорость (красный = медленно, зелёный = быстро)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 "Направление (красный = запад, желтый = север, зелёный = восток, синий = юг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -15078,9 +15117,9 @@
 "имеются)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+msgstr "Дата трека"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним цветом (может быть определено для именованных слоёв)"
@@ -15088,5 +15127,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -15110,5 +15149,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15151,5 +15190,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15163,38 +15202,18 @@
 msgstr "Пешком"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Создавать маркеры, читая GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Быстрая отрисовка (выглядит хуже)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Авто"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Имя"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Описание"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Оба"
+msgstr "Динамический цветовой диапазон на основе пределов данных"
 
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15204,10 +15223,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Рисовать линии между точками GPS"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15217,10 +15236,10 @@
 "чтобы рисовать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальная длина для локальных файлов (в метрах)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15229,20 +15248,20 @@
 "чтобы отображать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Максимальная длина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
-msgstr "Отображать линии, даже если нет импортированой информации о линиях."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+msgstr "Отображать линии, даже если нет импортированной информации о линиях."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15251,5 +15270,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15257,14 +15276,14 @@
 msgstr "Не отображать стрелки, если они находятся близко от предыдущих стрелок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Минимальное расстояние (в пикселях)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Отображать точки GPS более жирно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15274,13 +15293,13 @@
 "Менеджере Слоев."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Цвета точек и сегментов треков по скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+msgstr "Раскрасить точки и сегменты трека по направлению."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15290,27 +15309,45 @@
 "устройство захвата требует регистрации этой информации."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
-msgstr ""
+msgstr "Раскрасить точки и сегменты трека по меткам времени."
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Раскрасить треки и точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+msgstr "Раскрасить точки и сегменты трека по пределам данных."
+
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Отображение путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15593,9 +15630,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244
 msgid "JOSM Internal Style"
-msgstr "Встроеный стиль JOSM"
+msgstr "Встроенный стиль JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245
 msgid "Internal style to be used as base for runtime switchable overlay styles"
-msgstr "Встроеный стиль, используемый как базовый для подключаемых стилей"
+msgstr "Встроенный стиль, используемый как базовый для подключаемых стилей"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249
@@ -15651,5 +15688,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:270
 msgid "Download list"
-msgstr "Скачать список с сервера"
+msgstr "Скачать список"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:271
@@ -15775,8 +15812,8 @@
 "клавишам'', соответствующим вашей клавиатуре (например: '':''/двоеточие). "
 "Пожалуйста, не используйте её, либо используйте вместо этого базовые клавиши "
-"('';''/точка с запятаей на клавиатурах US, ''.''/Точка на клавиатурах "
-"German, и т.д.). Если вы не сделаете так, могут возникнуть конфликты, так "
-"как JOSM не понимает, что Ctrl+Shift+; это то же самое, что Ctrl+: на "
-"клавиатуре US.</p>"
+"('';''/точка с запятой на клавиатурах US, ''.''/Точка на клавиатурах German, "
+"и т.д.). Если вы не сделаете так, могут возникнуть конфликты, так как JOSM "
+"не понимает, что Ctrl+Shift+; это то же самое, что Ctrl+: на клавиатуре US.</"
+"p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:173
@@ -15982,5 +16019,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54
 msgid "Confirm all Remote Control actions manually"
-msgstr "Подтвердить все действия удаленного доступа в ручную"
+msgstr "Подтвердить все действия удаленного доступа вручную"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
@@ -16010,11 +16047,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"всегда прослушивает порт 8111. Настройка параметров порта не возможна, так "
-"как она зависит от внешнего приложения, к которому обращается и не имеет "
-"доступ JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -16055,5 +16089,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
-msgstr "Горячая клвиша"
+msgstr "Горячая клавиша"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:314
@@ -16104,5 +16138,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Сброс"
@@ -16389,6 +16423,6 @@
 "list of available plugins."
 msgstr ""
-"Нажмите на кнопку <strong>Скачать список с сервера</strong>, чтобы скачть "
-"список доступных модулей."
+"Нажмите на кнопку <strong>Скачать список</strong>, чтобы скачать и "
+"посмотреть список доступных модулей."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:114
@@ -16404,6 +16438,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Всегда обновлять не спрашивая"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16417,5 +16451,5 @@
 "startup after an update of JOSM itself."
 msgstr ""
-"Пожалуйста решите, нужно ли автоматически обновлять установленные модули, "
+"Пожалуйста, решите, нужно ли автоматически обновлять установленные модули, "
 "после загрузки новой версии JOSM."
 
@@ -16429,5 +16463,5 @@
 "certain periode of time."
 msgstr ""
-"Пожалуйста решите, нужно ли автоматически время от времени обновлять "
+"Пожалуйста, решите, нужно ли автоматически время от времени обновлять "
 "установленные модули."
 
@@ -16659,6 +16693,6 @@
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
-"Пожалуйста введите имя пользователя и пароль, если ваш прокси-сервер требует "
-"идентификацию личности"
+"Пожалуйста, введите имя пользователя и пароль, если ваш прокси-сервер "
+"требует идентификации"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -16680,5 +16714,5 @@
 msgstr ""
 "Использовать стандартные системные настройки (Заблокировано. Запустите JOSM "
-"с прараметром <tt>-Djava.net.useSystemProxies=true</tt> для разблокировки)"
+"с параметром <tt>-Djava.net.useSystemProxies=true</tt> для разблокировки)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -16688,5 +16722,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:274
 msgid "Use a SOCKS proxy"
-msgstr "Использовать SOCKS прокси сервер"
+msgstr "Использовать SOCKS прокси-сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:318
@@ -16839,5 +16873,5 @@
 msgstr "Новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16866,9 +16900,9 @@
 msgstr "Поиск заготовок"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Показывать только подходящие к выделенным"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Поиск в тегах"
@@ -17057,5 +17091,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
 msgid "Parsing response from server..."
-msgstr "Разбор ответа сервера ..."
+msgstr "Разбор ответа сервера..."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
@@ -17171,8 +17205,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Произошла ошибка при разборе файла gpx {0}. Доступна только часть файла"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17249,18 +17282,20 @@
 "header. Can''t redirect. Aborting."
 msgstr ""
+"Неожиданный ответ от HTTP сервера. Получен {0} ответ без заголовка "
+"''Местоположение''. Перенаправление невозможно. Останов."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
 msgid "Too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgstr "Обнаружено слишком много перенаправлений на URL загрузки. Отмена."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
 #, java-format
 msgid "Download redirected to ''{0}''"
-msgstr ""
+msgstr "Загрузка перенаправлена на ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
 #, java-format
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
-msgstr ""
+msgstr "Ошибка чтения с ''{0}''. Сервер ответил с кодом состояния {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -17338,5 +17373,5 @@
 #, java-format
 msgid "Coordinates imported: {0}"
-msgstr "Импортировано координат : {0}"
+msgstr "Импортировано координат: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:59
@@ -17348,10 +17383,10 @@
 #, java-format
 msgid "Checksum errors: {0}"
-msgstr "Ошибок проверки контрольной суммы : {0}"
+msgstr "Ошибок проверки контрольной суммы: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:62
 #, java-format
 msgid "Unknown sentences: {0}"
-msgstr "Неизвестное выражение : {0}"
+msgstr "Неизвестное выражение: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:64
@@ -17383,5 +17418,5 @@
 "{1}."
 msgstr ""
-"Поддерживается протокол версии 0.6, в то время, как сервер сказал, что он "
+"Поддерживается протокол версии 0.6, в то время как сервер сказал, что он "
 "поддерживает {0} до {1}."
 
@@ -17505,5 +17540,5 @@
 msgid "Prolog of OsmChange document already written. Please write only once."
 msgstr ""
-"Пролог документа OsmChange уже записан. Пожалуйста записывайте только один "
+"Пролог документа OsmChange уже записан. Пожалуйста, записывайте только один "
 "раз."
 
@@ -17511,7 +17546,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"Шапка документа OsmChange ещё не записана. Пожалуйста, сначала запишите её."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17742,9 +17776,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Отсутствуют обязательные атрибуты элемента ''bounds'' (границы). Получено "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17869,5 +17901,5 @@
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: Исправление значения атрибута ''version'' для элемента {0} "
-"на {2}, версия API : ''{3}''. Получено {1}."
+"на {2}, версия API: ''{3}''. Получено {1}."
 
 #. should not happen. API version has been checked before
@@ -17896,5 +17928,5 @@
 "Resetting to 0."
 msgstr ""
-"Неверное значение атрибуда ''changeset'' для нового объекта {1}. Получено "
+"Неверное значение атрибута ''changeset'' для нового объекта {1}. Получено "
 "{0}. Будет сброшено к 0."
 
@@ -17945,6 +17977,6 @@
 "missing in the loaded data."
 msgstr ""
-"Линия {0} с {1} точками содержит незавершённые точки, потому что по крайней "
-"мере одна точка отсутствовала в данных, загруженных с сервера."
+"Линия {0} с {1} точками содержит незавершённые точки, потому что, по крайней "
+"мере, одна точка отсутствовала в данных, загруженных с сервера."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:510
@@ -18022,7 +18054,7 @@
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] "Скачивание {0} пакета правок с сервера ..."
-msgstr[1] "Downloading {0} changesets ..."
-msgstr[2] "Скачивание {0} пакетов правок с сервера ..."
+msgstr[0] "Скачивание {0} пакета правок с сервера..."
+msgstr[1] "Скачивание {0} пакетов правок с сервера..."
+msgstr[2] "Скачивание {0} пакетов правок с сервера..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
@@ -18030,5 +18062,5 @@
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr "({0}/{1}) Скачивание пакета правок {2} с сервера ..."
+msgstr "({0}/{1}) Скачивание пакета правок {2} с сервера..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
@@ -18158,4 +18190,9 @@
 msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18179,4 +18216,6 @@
 "''&'' or a trailing ''?''."
 msgstr ""
+"Внимание: В базовом URL ''{0}'' WMS сервиса отсутствуют замыкающие ''&'' или "
+"''?''."
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:148
@@ -18185,5 +18224,5 @@
 "settings."
 msgstr ""
-"Предупреждение: Выборка WMS квадратов карты скорее всего не получится. "
+"Предупреждение: Выборка WMS квадратов карты, скорее всего, не получится. "
 "Пожалуйста, проверьте настройки параметров."
 
@@ -18325,5 +18364,5 @@
 #, java-format
 msgid "replaced by new {0} plugin"
-msgstr "заменено новым {0} плагином"
+msgstr "заменено новым {0} модулем"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:196
@@ -18400,6 +18439,6 @@
 "startup is disabled."
 msgstr ""
-"Запуск периодичского обновления модуля. Автоматическое обновление в момент "
-"запуска включено."
+"Запуск периодического обновления модуля. Автоматическое обновление в момент "
+"запуска выключено."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324
@@ -18455,5 +18494,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:505
 msgid "Loading plugins ..."
-msgstr "Загрузка модулей с сервера ..."
+msgstr "Загрузка модулей с сервера..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:506
@@ -18603,5 +18642,5 @@
 "unload the plugin."
 msgstr ""
-"Модуль удалён из настроек. Пожалуйста, перезагрузите JOSM чтобы выгрузить "
+"Модуль удалён из настроек. Пожалуйста, перезагрузите JOSM, чтобы выгрузить "
 "модуль."
 
@@ -18621,5 +18660,5 @@
 msgstr ""
 "Не спрашивать и запомнить мой выбор (перейти к Настройки->Модули, чтобы "
-"измененить его позже)"
+"изменить его позже)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:88
@@ -18659,5 +18698,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:91
 msgid "Processing plugin site cache files..."
-msgstr "Модуль обработки файлов кеша сайта..."
+msgstr "Модуль обработки файлов кэша сайта..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:95
@@ -18797,5 +18836,5 @@
 msgstr ""
 "Как альтернатива, если это устройство не работает, вы можете вручную вписать "
-"информацию ниже, по этой URL:"
+"информацию ниже, по этому URL:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:133
@@ -18824,8 +18863,8 @@
 "Access Token.</html>"
 msgstr ""
-"<html>Не удалось идентифицировать сервер OSM ''{0}''.<br>Вы используете "
-"идентификацию OAuth, но в настоящий момент нет<br>сконфигурированного "
-"маркера доступа OAuth.<br>Пожалуйста откройте диалог настроек и сгенерите "
-"или введите маркер доступа.</html>"
+"<html>Не удалось идентифицироваться на сервере OSM ''{0}''.<br>Вы "
+"используете идентификацию OAuth, но в настоящий момент "
+"нет<br>сконфигурированного маркера доступа OAuth.<br>Пожалуйста, откройте "
+"диалог настроек и сгенерируйте или введите маркер доступа.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:79
@@ -18878,5 +18917,5 @@
 "agree, but you must view them.</html>"
 msgstr ""
-"<html>Ваш доступ к API временно приостановлен.<br>Пожалуйста войдите через "
+"<html>Ваш доступ к API временно приостановлен.<br>Пожалуйста, войдите через "
 "веб-интерфейс для просмотра условий участия.<br>Вам не обязательно "
 "соглашаться, но вы должны просмотреть их.</html>"
@@ -18977,5 +19016,5 @@
 msgstr ""
 "<html>Невозможно открыть соединение с удаленным сервером<br>''{0}''<br>по "
-"причинам безопасности. Скорее всего вы запустили<br>приложение без загрузки "
+"причинам безопасности. Скорее всего, вы запустили<br>приложение без загрузки "
 "формы приложения ''{1}''.</html>"
 
@@ -18987,5 +19026,5 @@
 msgstr ""
 "<html>Невозможно установить соединение с удаленным сервером<br>''{0}''."
-"<br>Пожалуйста проверьте свое подключение к интернету.</html>"
+"<br>Пожалуйста, проверьте свое подключение к интернету.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:353
@@ -19027,5 +19066,5 @@
 "community."
 msgstr ""
-"Область, которую вы хотите скачать слишком велика или запрошено слишком "
+"Область, которую вы хотите скачать, слишком велика или запрошено слишком "
 "много данных.<br>Выделите меньшую область или воспользуйтесь другими "
 "средствами экспорта файлов OSM."
@@ -19057,5 +19096,5 @@
 msgstr ""
 "<html>Невозможно открыть соединение с удаленным сервером<br>''{0}''.<br>Имя "
-"хоста ''{1}'' не отвечает. <br>Пожалуйста проверьте адрес API в настройках "
+"хоста ''{1}'' не отвечает. <br>Пожалуйста, проверьте адрес API в настройках "
 "программы и ваше соединение с интернет.</html>"
 
@@ -19089,4 +19128,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -19225,4 +19266,18 @@
 msgstr "Невозможно загрузить XML схему."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19243,5 +19298,5 @@
 #: build/specialmessages.java:9
 msgid "Database offline for maintenance"
-msgstr "База даных отключена на обслуживание"
+msgstr "База данных отключена на обслуживание"
 
 #. OSM server message
@@ -19399,5 +19454,5 @@
 msgctxt "Place type"
 msgid "borough"
-msgstr "borough"
+msgstr "поселок"
 
 #. relation place type
@@ -19405,5 +19460,5 @@
 msgctxt "Place type"
 msgid "municipality"
-msgstr "municipality"
+msgstr "муниципалитет"
 
 #. relation place type
@@ -19417,5 +19472,5 @@
 msgctxt "Place type"
 msgid "county"
-msgstr "county"
+msgstr "округ"
 
 #. relation place type
@@ -19746,5 +19801,5 @@
 #: build/trans_plugins.java:25
 msgid "Download your GPX tracks from openstreetmap.org"
-msgstr "Загрузить ваши GPX трэки с openstreetmap.org"
+msgstr "Загрузить ваши GPX треки с openstreetmap.org"
 
 #. Plugin DirectUpload
@@ -19774,11 +19829,10 @@
 #: build/trans_plugins.java:33
 msgid "Shows the elevation profile and some statistical data of a GPX track."
-msgstr ""
-"Показывает профайл возвышений и некоторые статистические данные трека GPX."
+msgstr "Показывает профиль высот и некоторые статистические данные трека GPX."
 
 #. Plugin epci-fr
 #: build/trans_plugins.java:35
 msgid "Handling of French EPCIs (boundary=local_authority)"
-msgstr ""
+msgstr "Обработка французского EPCIs (boundary=local_authority)"
 
 #. Plugin epsg31287
@@ -19806,5 +19860,5 @@
 #: build/trans_plugins.java:43
 msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr "Поиск и исправление не верной нумерации домов удобным образом."
+msgstr "Поиск и исправление неверной нумерации домов удобным образом."
 
 #. Plugin globalsat
@@ -19816,11 +19870,11 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Позволяет отфильтровать не нужные GPS трэки"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
 #: build/trans_plugins.java:49
 msgid "Visualizes routing information as a routing graph."
-msgstr "Показывает информацию о маршруте в виде диаграмы."
+msgstr "Показывает информацию о маршруте в виде диаграммы."
 
 #. Plugin imageryadjust
@@ -19837,5 +19891,5 @@
 msgstr ""
 "Модуль для совмещения изображения с путевыми точками GPX трека. Совмещение "
-"будет произведено, когда аттрибут тегов ''name'', ''cmt'' или ''desc'' "
+"будет произведено, когда атрибут тегов ''name'', ''cmt'' или ''desc'' "
 "путевой точки, будет совпадать с именем файла изображения."
 
@@ -19857,5 +19911,5 @@
 "quicken the editing process."
 msgstr ""
-"Может быть полезен для улучшения точности существующих путей. Идея плагина "
+"Может быть полезен для улучшения точности существующих путей. Идея модуля "
 "состоит в замене перетаскивания точек на щелчки, чтобы ускорить процесс "
 "редактирования."
@@ -19867,4 +19921,6 @@
 "trackpoint info"
 msgstr ""
+"Всплывающие окна с дополнительной информацией об  объектах текущего слоя  - "
+"в настоящее время информацией о точке трека GPX"
 
 #. Plugin irsrectify
@@ -19912,5 +19968,5 @@
 "MapDust Plug-In показывает MapDust об ошибке на карте. Вы можете создавать, "
 "закрывать, делать недействительными, снова открывать и комментировать "
-"сообщения об ошибке с помощью этого плагина."
+"сообщения об ошибке с помощью этого модуля."
 
 #. Plugin measurement
@@ -20081,5 +20137,5 @@
 msgstr ""
 "Упростить полигон, удалением точек на очень тупых углах. Данное действие "
-"может быть ограничено указанием масимального размера удаляемого фрагмента. "
+"может быть ограничено указанием максимального размера удаляемого фрагмента. "
 "Также удаляет близкорасположенные точки."
 
@@ -20181,5 +20237,5 @@
 msgstr ""
 "(Этот модуль в настоящий момент работает!!!) Привязывает и синхронизирует "
-"видео к положениею на GPS треке, чтобы можно было использовать это видео для "
+"видео к положению на GPS треке, чтобы можно было использовать это видео для "
 "нанесения приметных объектов."
 
@@ -22382,5 +22438,5 @@
 #: build/trans_presets.java:469
 msgid "trunk_link"
-msgstr "cъезд с автострады"
+msgstr "съезд с автострады"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
@@ -22700,8 +22756,7 @@
 "grassy acclivities, jagged rocks, facile snow-free glaciers."
 msgstr ""
-"Требуются свободные руки для продвижения вперед. Terrain quite exposed, "
-"precarious grassy acclivities, jagged rocks, facile snow-free glaciers. "
-"Рельеф местности достаточно исследован, но имеются неустойчивые травяные "
-"склоны, острые камни, участки земли, покрытые льдом."
+"Требуются свободные руки для продвижения вперед. Рельеф местности достаточно "
+"открытый, но имеются неустойчивые травяные склоны, острые камни, ровные "
+"бесснежные ледники."
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
@@ -23247,5 +23302,5 @@
 #: build/trans_presets.java:775
 msgid "chicane"
-msgstr "шикана"
+msgstr "зигзагообразные препятствия"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
@@ -23566,10 +23621,10 @@
 #: build/trans_presets.java:912
 msgid "wood_fence"
-msgstr "деревянный забор"
+msgstr "деревянный_забор"
 
 #. item "Barriers/Fence" combo "Fence" display value
 #: build/trans_presets.java:912
 msgid "wire_fence"
-msgstr "проволочный забор"
+msgstr "проволочный_забор"
 
 #. item "Barriers/Wall"
@@ -23779,5 +23834,5 @@
 #: build/trans_presets.java:1093
 msgid "Weir"
-msgstr "Водосливной порог"
+msgstr "Небольшая плотина"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
@@ -23785,5 +23840,5 @@
 #: build/trans_presets.java:1095
 msgid "Edit Weir"
-msgstr "Свойства водосливного порога"
+msgstr "Свойства небольшой плотины"
 
 #. item "Water/Water/Dam"
@@ -23921,5 +23976,5 @@
 #: build/trans_presets.java:1167
 msgid "reedbed"
-msgstr "тросниковые заросли (плавни)"
+msgstr "тростниковые заросли (плавни)"
 
 #. item "Water/Water/Wetland" combo "Type" display value
@@ -24333,5 +24388,5 @@
 #: build/trans_presets.java:1336
 msgid "contact_line"
-msgstr "контактный провод"
+msgstr "контактный_провод"
 
 #. item "Transport/Railway/Rail" combo "Electrified" display value
@@ -24625,5 +24680,5 @@
 #: build/trans_presets.java:1408
 msgid "Edit Cable Car"
-msgstr "Свойства кабиночной канатной дороги"
+msgstr "Свойства фуникулера"
 
 #. item "Aerialway/Gondola"
@@ -25512,5 +25567,5 @@
 #: build/trans_presets.java:1492
 msgid "Amperage"
-msgstr "Ампераж"
+msgstr "Сила тока"
 
 #. item "Car/Wash"
@@ -25738,5 +25793,5 @@
 #: build/trans_presets.java:1544
 msgid "Edit Car Sharing"
-msgstr "Свойсттва кратковременного проката автомобилей"
+msgstr "Свойства кратковременного проката автомобилей"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
@@ -25902,9 +25957,11 @@
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr ""
+"Инструменты для самостоятельного ремонта (может быть объединение "
+"велосипедистов)"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
 #: build/trans_presets.java:1604
 msgid "Bicycles are washed (for a fee)"
-msgstr ""
+msgstr "Велосипеды моют (за отдельную плату)"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
@@ -26514,5 +26571,5 @@
 #: build/trans_presets.java:2063 build/trans_presets.java:2078
 msgid "dedicated"
-msgstr "выделеный"
+msgstr "выделенный"
 
 #. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
@@ -26816,5 +26873,5 @@
 #: build/trans_presets.java:1966
 msgid "Edit Fast Food Restaurant"
-msgstr "Свофства ресторана быстрого питания"
+msgstr "Свойства ресторана быстрого питания"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
@@ -28237,5 +28294,5 @@
 msgctxt "shelter"
 msgid "picnic_shelter"
-msgstr ""
+msgstr "навес_для_пикника"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
@@ -28347,5 +28404,5 @@
 msgctxt "hydrant position"
 msgid "lane"
-msgstr ""
+msgstr "переулок"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
@@ -28353,5 +28410,5 @@
 msgctxt "hydrant position"
 msgid "parking_lot"
-msgstr ""
+msgstr "автостоянка"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
@@ -28359,5 +28416,5 @@
 msgctxt "hydrant position"
 msgid "sidewalk"
-msgstr ""
+msgstr "тротуар"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
@@ -28375,5 +28432,5 @@
 #: build/trans_presets.java:2589
 msgid "xx l/min"
-msgstr "xx l/min"
+msgstr "xx л/мин"
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
@@ -28891,5 +28948,5 @@
 #: build/trans_presets.java:2621 build/trans_presets.java:2630
 msgid "canoe"
-msgstr "гребля на каное / каяке"
+msgstr "гребля на каноэ / каяке"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29558,10 +29615,10 @@
 #: build/trans_presets.java:2676
 msgid "Canoeing"
-msgstr "Гребля на каное / каяке"
+msgstr "Гребля на каноэ / каяке"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
 #: build/trans_presets.java:2677
 msgid "Edit Canoeing"
-msgstr "Свойства гребли на каное / каяке"
+msgstr "Свойства гребли на каноэ / каяке"
 
 #. item "Sport/Cycling" label "Edit Cycling"
@@ -29897,5 +29954,5 @@
 #: build/trans_presets.java:2857
 msgid "Edit Hockey"
-msgstr "Свойства хокея"
+msgstr "Свойства хоккея"
 
 #. item "Sport (Ball)/Pelota"
@@ -30407,5 +30464,5 @@
 #: build/trans_presets.java:3028
 msgid "Edit Wastewater Plant"
-msgstr "Свойства чистных сооружений"
+msgstr "Свойства очистных сооружений"
 
 #. item "Man Made/Man Made/Watermill"
@@ -31164,5 +31221,5 @@
 #: build/trans_presets.java:3380
 msgid "Edit Tailor"
-msgstr "Редактировать Партного"
+msgstr "Свойства портного"
 
 #. item "Clothes/Fabric"
@@ -31495,5 +31552,5 @@
 #: build/trans_presets.java:3615
 msgid "Travel Agency"
-msgstr "Туристическое агенство"
+msgstr "Туристическое агентство"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
@@ -31785,5 +31842,5 @@
 #: build/trans_presets.java:3741
 msgid "Edit Town"
-msgstr "Свойствао малого города / посёлка"
+msgstr "Свойства малого города / посёлка"
 
 #. item "Places/Suburb"
@@ -36193,4 +36250,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -36207,6 +36265,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -36225,15 +36283,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "сокращённое название улицы"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "тег oneway на точке"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "тег bridge на точке"
@@ -36244,12 +36302,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "неверный тег highway на точке"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Безымянная дорога низкого класса"
@@ -36258,16 +36316,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "дорога без классификации"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "временная дорога"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "опечатка в названии ключа"
@@ -36277,10 +36335,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "велодорожка с тегом bicycle"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "пешеходная дорожка с тегом foot"
@@ -36289,10 +36347,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "отдельная полоса для велосипедов (велодорожка)"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "на линии находится заграждение для велосипедов"
@@ -36301,36 +36359,45 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr ""
 "для пешеходной дороги установлена максимальная скорость движения транспорта"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "тег слоя со знаком +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "название улицы содержит ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "Отношение без типа"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "ресторан без имени"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "необычная комбинация тегов"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36428,5 +36495,5 @@
 #: build/trans_wms.java:20
 msgid "Bayern (2m)"
-msgstr ""
+msgstr "Bayern (2м)"
 
 #. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
@@ -36435,118 +36502,128 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "MSR Maps Topo"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "MSR Maps Urban"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "карты NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Карты (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "Японский MLIT (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "Японский MLIT (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "Японский MLIT (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "Японский MLIT (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Италия"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Италия"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 — Италия"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Франция)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA Spain"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Estonia Basemap (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Estonia Ortho (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Estonia Multi (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Denmark)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Дания)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Pangasinan (HiRes Филиппины)"
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
+msgstr ""
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
@@ -36799,6 +36876,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Загрузка на сервер отменена"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36877,5 +36954,5 @@
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:164
 msgid "Geoid"
-msgstr "Geoid"
+msgstr "Геоид"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:180
@@ -36890,5 +36967,5 @@
 #, java-format
 msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "Профиль высот для трека ''{0}''."
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java:120
@@ -36900,9 +36977,9 @@
 msgstr "(Высоты отсутствуют)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr "Не удается сохранить настройки"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr "Настройки FastDraw"
@@ -36910,35 +36987,63 @@
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:29
 msgid "Epsilon multiplier"
-msgstr ""
+msgstr "Множитель эпсилона"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:30
 msgid "Starting Epsilon"
-msgstr ""
+msgstr "Начальный эпсилон"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:31
 msgid "Max points count per 1 km"
-msgstr ""
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+msgstr "Максимальное число точек на 1 км"
+
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr "Параметры FastDraw"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr "Сохранить параметры"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
-msgstr ""
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-"Нажмите Enter для упрощения или сохранения, Ctrl-Enter для сохранения с "
-"тегами, Вверх/Вниз для настройки упрощения"
+msgstr "Не удается прочитать параметры"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36949,33 +37054,61 @@
 "сохранения, нажатие с Ctrl-Shift для начала новой линии"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr "FastDrawing"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr "Режим быстрого рисования"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
-msgstr "Двигайте мышь чтобы нарисовать новую линию"
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+msgstr "Двигайте мышь, чтобы нарисовать новую линию"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Информация о модуле"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
-msgstr ""
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+msgstr "Не удается поместить точку за пределами мира."
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr "Рисуйте линию мышью"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
-msgstr ""
+msgstr "Eps={0}, {1} точек, {2} на км"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Исправить адресацию"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -37086,9 +37219,9 @@
 msgstr "Показать неполные адреса"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "элементы"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "элементы отсутствуют"
@@ -37139,5 +37272,5 @@
 "current layer."
 msgstr ""
-"Создать отношение между улицами и ревалентными адресами для ВСЕХ улиц в "
+"Создать отношение между улицами и связанными адресами для ВСЕХ улиц в "
 "выделенном слое."
 
@@ -37148,5 +37281,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java:33
 msgid "Create relation between street and related addresses."
-msgstr "Создать отношение между улицей и ревалентными адресами."
+msgstr "Создать отношение между улицей и связанными адресами."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java:68
@@ -37163,5 +37296,5 @@
 "according tag."
 msgstr ""
-"Пытаться подобрать адрес выбирая ближайший объект с соответствующим тэгом."
+"Пытаться подобрать адрес, выбирая ближайший объект с соответствующим тэгом."
 
 #. Launch address guessing thread
@@ -37190,17 +37323,34 @@
 msgstr "Выделить все адреса с неполными данными."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Свойства слоя"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Импортировать изображение"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Импортировать геопривязанное изображение"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Ошибка при создании слоя с изображением: "
@@ -37240,5 +37390,5 @@
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:352
 msgid "Cannot place a node outside of the world."
-msgstr ""
+msgstr "Не удается поместить точку за пределами мира"
 
 #. Finishing the sequence command
@@ -37293,5 +37443,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:161
 msgid "Correct the value manually and than press Enter."
-msgstr "Исправьте значение в ручную и нажмите ввод."
+msgstr "Исправьте значение вручную и нажмите ввод."
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:163
@@ -37410,5 +37560,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:697
 msgid "Please select address interpolation way for this street"
-msgstr "Пожалуйста выберите интерполяцию адресов на линии для этой улицы"
+msgstr "Пожалуйста, выберите путь интерполяции адресов для этой улицы"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1085
@@ -37541,4 +37691,10 @@
 "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
+"Добро пожаловать в</span><br>\n"
+"модуль <span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
+"(204, 85, 0);\">S</span><br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"... или лучше его следовало бы назвать <br>\n"
+"модуль <span style=\"font-size: large;\">AlignWayS(egments)</span>..."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:82
@@ -37669,4 +37825,15 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Выровнять сегменты.</b> Нажмите <b><i><span style=\"color:green\">"
+"{0}</span></i></b>. Также вы найдете команду в меню <b>Инструменты</b>\n"
+"или, возможно, захотите поместить действие на <b>панель инструментов</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:106
@@ -37720,5 +37887,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:17
 msgid "Big buildings mode"
-msgstr "Режим большх зданий"
+msgstr "Режим больших зданий"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:18
@@ -37807,5 +37974,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:447
 msgid "Next no"
-msgstr "Next no"
+msgstr "Следующий №"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:489
@@ -37820,7 +37987,7 @@
 "(No = new cache)"
 msgstr ""
-"Положение \"{0}\" найдено в кеше.\n"
-"Сначала загрузить кеш?\n"
-"(Нет = новый кеш)"
+"Положение \"{0}\" найдено в кэше.\n"
+"Сначала загрузить кэш?\n"
+"(Нет = новый кэш)"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -37889,5 +38056,5 @@
 msgstr ""
 "Не удается открыть новую сессию клиента.\n"
-"Сервер на обслуживании или временного перегружен."
+"Сервер на обслуживании или временно перегружен."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:93
@@ -37910,31 +38077,35 @@
 msgstr "Выберите общее"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Авто источники"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Модуль cadastre-fr использует для захвата клавишу F11,\n"
-"которая по обычно включает полноэкранный режим.\n"
-"Вы хотите назначить на клавишу F11 функцию захвата?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Восстановить действие захватывающей клавиши F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM остановлено для того, чтобы проявились изменения."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37981,5 +38152,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
 msgid "off"
-msgstr ""
+msgstr "выкл."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
@@ -37997,9 +38168,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
 msgid "high"
-msgstr ""
+msgstr "высокое"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 msgid "medium"
-msgstr ""
+msgstr "среднее"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
@@ -38029,10 +38200,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
 msgid "Enable automatic caching."
-msgstr "Включить автоматическое кеширование."
+msgstr "Включить автоматическое кэширование."
 
 #. disabled by default
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
 msgid "Max. cache size (in MB)"
-msgstr "Макс. размер кеша (МБ)"
+msgstr "Макс. размер кэша (МБ)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
@@ -38062,8 +38233,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Заменить оригинальный белый фон на цвет фона, заданный в настройках JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38112,5 +38282,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr "Ближайший-Сосед (быстро) [ По умолчанию]"
+msgstr "Ближайший-Сосед (быстро) [По умолчанию]"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184
@@ -38194,4 +38364,6 @@
 "Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
+"Добавить \"Tableau(x) d''assemblage\" в список кадастровых листов для "
+"захвата."
 
 #. the crosspiece display
@@ -38202,5 +38374,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
 msgid "Allows an automatic caching"
-msgstr ""
+msgstr "Разрешает автоматическое кэширование"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38281,5 +38453,5 @@
 "Use the normal Cadastre Grab menu."
 msgstr ""
-"Район векторизован !\n"
+"Район векторизован!\n"
 "Используйте нормальное меню захвата кадастра."
 
@@ -38336,5 +38508,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:34
 msgid "Georeference an image"
-msgstr ""
+msgstr "Геопривязка изображения"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:56
@@ -38398,9 +38570,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:293
 msgid "Enter cadastre east,north position"
-msgstr "Ввести кадастровую позицию восток,север"
+msgstr "Ввести кадастровую позицию восток, север"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:295
 msgid "(Warning: verify north with arrow !!)"
-msgstr "(Предупреждение: проверьте направление на север с помощью стрелки !!)"
+msgstr "(Предупреждение: проверьте направление на север с помощью стрелки!!)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
@@ -38499,5 +38671,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:21
 msgid "Save image as PNG"
-msgstr ""
+msgstr "Сохранить изображение в формате PNG"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:38
@@ -38540,5 +38712,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:235
 msgid "Is not vectorized."
-msgstr "Не векторизованны."
+msgstr "Не векторизованы."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:236
@@ -38567,14 +38739,14 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:451
 msgid "Cache Format Error"
-msgstr "Ошибка формата кеша"
+msgstr "Ошибка формата кэша"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:475
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
+msgstr "Зона Ламберта {0} в кэше несовместима с текущей зоной Ламберта {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:477
 msgid "Cache Lambert Zone Error"
-msgstr "Ошибка кеширования зоны Ламберта"
+msgstr "Ошибка кэширования зоны Ламберта"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
@@ -38989,5 +39161,5 @@
 msgstr "Добавить EGPX слой"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38997,17 +39169,17 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Отображать линии между точками для этого слоя."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Не отображать линии между точками для этого слоя."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Выбрать варианты отрисовки линий"
@@ -39020,22 +39192,22 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:148
 msgid "Classes element below root child level"
-msgstr ""
+msgstr "Элемент классов перед корневым уровнем наследника"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:134
 #, java-format
 msgid "Class element ({0}) outside classes element"
-msgstr ""
+msgstr "Элемент класса ({0}) вне элемента классов"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:136
 msgid "Class element without name"
-msgstr ""
+msgstr "Элемент класса без имени"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:158
 msgid "Tag element outside basetag and implication elements"
-msgstr ""
+msgstr "Элемент тега вне базового тега и элементов включения"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:164
 msgid "Implications element below root child level"
-msgstr ""
+msgstr "Элемент включения перед корневым уровнем наследника"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:180
@@ -39052,21 +39224,21 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:199
 msgid "Closed classes while it was not open"
-msgstr ""
+msgstr "Закрытие классов до их открытия"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:201
 msgid "Closed classes element before all class elements were closed"
-msgstr ""
+msgstr "Закрытие элемента классов  до закрытия всех элементов класса"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:209
 msgid "Closed class element while none was open"
-msgstr ""
+msgstr "Закрытие элемента класса  до открытия"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:217
 msgid "Closed basetags while it was not open"
-msgstr ""
+msgstr "Закрытие базовых тегов до открытия"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:225
 msgid "Closed implications while it was not open"
-msgstr ""
+msgstr "Закрытие включения до открытия"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:71
@@ -39082,9 +39254,9 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:95
 msgid "Condition isn''t finished at </condition> tag"
-msgstr ""
+msgstr "Условие не завершено тегом </condition>"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:114
 msgid "Closing tag element that was not open"
-msgstr ""
+msgstr "Закрывающий элемент не открытого тега"
 
 #. all vaild paths end with return; reaching this indicates an invalid tag
@@ -39101,5 +39273,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:167
 msgid "Key element without attribute k"
-msgstr ""
+msgstr "Ключевой элемент без атрибута k"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:189
@@ -39150,5 +39322,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/JunctionEvaluationGroup.java:70
 msgid "Group not yet evaluated"
-msgstr ""
+msgstr "Группа еще не оценена"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogic.java:92
@@ -39159,5 +39331,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr "Набор правил не выбран!"
@@ -39165,10 +39337,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr "Нет набора правил"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -39176,6 +39348,8 @@
 "{0}"
 msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+"Синтаксическое исключение в наборе правил доступа:\n"
+"{0}"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -39186,6 +39360,6 @@
 " {0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -39196,12 +39370,12 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr "Файл не найден:\n"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
-msgstr ""
+msgstr "Не найден встроенный набор правил {0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:54
@@ -39244,22 +39418,22 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:106
 msgid "Access class"
-msgstr ""
+msgstr "Класс доступа"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:121
 #, java-format
 msgid "Access class must not contain ''{0}''!"
-msgstr ""
+msgstr "Класс доступа не должен содержать ''{0}''!"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:139
 msgid "Access types"
-msgstr ""
+msgstr "Типы доступа"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:176
 msgid "Vehicle properties"
-msgstr ""
+msgstr "Свойства транспортного средства"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:225
 msgid "Road requirements"
-msgstr ""
+msgstr "Требования к дороге"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:232
@@ -39291,8 +39465,10 @@
 "(;)"
 msgstr ""
+"Список дорожных покрытий, непригодных для транспортного средства. Значения "
+"разделяются точкой с запятой (;)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:290
 msgid "max. tracktype grade"
-msgstr ""
+msgstr "макс. класс дорожного покрытия"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:291
@@ -39300,4 +39476,6 @@
 msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
+"Наихудшее дорожное покрытие (1-5), которое транспортное средство все еще "
+"можете использовать, 0 ни для одного"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:345
@@ -39311,5 +39489,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:69
 msgid "Graph View Dialog"
-msgstr ""
+msgstr "Диалог Graph View"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:70
@@ -39357,71 +39535,79 @@
 msgstr "Создать/обновить график"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr "Просмотр графика"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr "Настройки модуля Graphview, который визуализирует дорожные графы."
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr "Набор правил"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr "Использовать встроенные наборы правил"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr "Выбрать директорию"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr "Транспортное средство"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Создать"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr "Восстановить по умолчанию"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr "Визуализация"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr "Рисовать направления раздельно"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr "Цвет узла"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr "Цвет стрелки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr "Новая закладка"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr "Действительно удалить \"{0}\"?"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr "Удаление закладки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39429,35 +39615,29 @@
 msgstr ""
 "Действительно восстановить пометки по умолчанию?\n"
-"Все добавленные в ручную или редактированные пометки будут потеряны!"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+"Все добавленные вручную или редактированные пометки будут потеряны!"
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr "Сбросить пометки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr "Выбрать цвет узла"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr "Выбрать цвет стрелки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr "Дорожный граф рассчитан модулем GraphView"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
-msgstr ""
+msgstr "Слой GraphView необъединяемый"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:35
@@ -39494,19 +39674,19 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:45
 msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgstr "Классы дорожного покрытия должна быть заданы целыми числами от 0 до 5."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:38
 msgid "Adjust imagery"
-msgstr "Выравнять снимок"
+msgstr "Выровнять снимок"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:39
 msgid "Adjust the position of the selected imagery layer"
-msgstr "Выравнять выбранный слой снимка"
+msgstr "Выровнять выбранный слой снимка"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:144
@@ -39628,32 +39808,45 @@
 msgstr "Импортирование..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+msgstr "InfoMode"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
-msgstr ""
+msgstr "Режим GPX информации"
+
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr "Спрятать это"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+msgstr "Спрятать это и старее"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+msgstr "Нет метки времени"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+msgstr "км/ч"
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
-msgstr ""
+msgstr "Имя трека: "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -39767,5 +39960,5 @@
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94
 msgid "check a marked subset if it is a junction"
-msgstr "проверить отмеченый поднабор на наличие соединения"
+msgstr "проверить отмеченный поднабор на наличие соединения"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:95
@@ -39790,5 +39983,5 @@
 "candidat mark these channel and press the \"Check\" button again."
 msgstr ""
-"Отмеченые каналы содержат кандидаты на соединение (белые). Для проверки "
+"Отмеченные каналы содержат кандидаты на соединение (белые). Для проверки "
 "этого кандидата отметьте этот канал и нажмите кнопку \"Проверить\" снова."
 
@@ -39796,9 +39989,9 @@
 #, java-format
 msgid "The marked channels are a {0}-ways junction"
-msgstr "Отмеченые каналы - это {0}-путевые соединения"
+msgstr "Отмеченные каналы - это {0}-путевые соединения"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:69
 msgid "The marked channels are not a junction:"
-msgstr "Отмеченые каналы - это не соединения:"
+msgstr "Отмеченные каналы - это не соединения:"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java:44
@@ -39809,5 +40002,5 @@
 #, java-format
 msgid "Number of {0}-ways junctions found: {1}"
-msgstr ""
+msgstr "Число найденных {0}-путевых соединений: {1}"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java:83
@@ -39818,5 +40011,5 @@
 #, java-format
 msgid "Direction index ''{0}'' not found"
-msgstr ""
+msgstr "Индекс направлений ''{0}'' не найден"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
@@ -40110,5 +40303,5 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:142
 msgid "Loading from Quick History Service..."
-msgstr ""
+msgstr "Загрузка из службы быстрой истории..."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:146
@@ -40120,5 +40313,5 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:103
 msgid "Relicensing problems"
-msgstr "Проблемы перелецинзирования"
+msgstr "Проблемы перелицензирования"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:76
@@ -40128,5 +40321,5 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:40
 msgid "Relicensing Problems"
-msgstr "Проблемы перелецинзирования"
+msgstr "Проблемы перелицензирования"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:101
@@ -40159,5 +40352,5 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
 msgid "license check notice"
-msgstr ""
+msgstr "заметка проверки лицензии"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:131
@@ -40358,9 +40551,9 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207
 msgid "No native password manager could be found!"
-msgstr ""
+msgstr "Собственный менеджер паролей не найден!"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -40368,5 +40561,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
 msgid "No thanks, use JOSM''s plain text preferences storage"
-msgstr ""
+msgstr "Нет, спасибо, использовать текстовое хранилище параметров JOSM"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
@@ -40375,12 +40568,14 @@
 "text)."
 msgstr ""
+"Найдены конфиденциальные данные, которые до сих пор сохраняются в файле "
+"настроек JOSM (в текстовом виде)."
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
 msgid "No, just keep it"
-msgstr ""
+msgstr "Нет, просто сохранить"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
@@ -40390,9 +40585,9 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
 msgid "Proceed and go to the next page"
-msgstr ""
+msgstr "Продолжить и перейти на следующую страницу"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
 msgid "Finish"
-msgstr ""
+msgstr "Завершить"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
@@ -40402,5 +40597,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
 msgid "JOSM/OSM API/Username"
-msgstr ""
+msgstr "JOSM/OSM API/Имя пользователя"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
@@ -40418,13 +40613,13 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
 msgid "JOSM/OAuth/OSM API/Key"
-msgstr ""
+msgstr "JOSM/OAuth/OSM API/Ключ"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
 msgid "JOSM/OAuth/OSM API/Secret"
-msgstr ""
+msgstr "JOSM/OAuth/OSM API/Секрет"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
 msgid "Native Password Manager Plugin"
-msgstr ""
+msgstr "Модуль Собственный менеджер паролей"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
@@ -40443,17 +40638,17 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
 msgid "proxy username"
-msgstr ""
+msgstr "имя пользователя на прокси-сервере"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
 msgid "proxy password"
-msgstr ""
+msgstr "пароль на прокси-сервере"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
 msgid "oauth key"
-msgstr ""
+msgstr "oauth ключ"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
 msgid "oauth secret"
-msgstr ""
+msgstr "oauth секрет"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
@@ -40463,4 +40658,6 @@
 "preference file. ({0})"
 msgstr ""
+"<br><strong>Внимание:</strong> Конфиденциальные данные могут остаться в "
+"вашем файле настроек. ({0})"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:242
@@ -40478,14 +40675,14 @@
 #, java-format
 msgid "Use {0}"
-msgstr ""
+msgstr "Использовать {0}"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:38
 msgid "Encrypt data with Windows logon credentials"
-msgstr ""
+msgstr "Зашифровать данные учётными данными входа в Windows"
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:42
 #, java-format
 msgid "The native password manager plugin detected {0} on your system."
-msgstr ""
+msgstr "Родной модуль менеджера паролей обнаружен {0} в вашей системе."
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
@@ -40504,5 +40701,5 @@
 msgstr ""
 "<html>Модуль openstreetbugs использует старый сервер appspot.com.<br>Новый "
-"сервер доступен на schokokeks.org.<br>Хотите переключится на новый сервер? "
+"сервер доступен на schokokeks.org.<br>Хотите переключиться на новый сервер? "
 "(Настоятельно рекомендуется)</html>"
 
@@ -41075,5 +41272,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:306
 msgid "Keep old backups and continue"
-msgstr "Сохранить старые файлы резервного копировния и продолжить"
+msgstr "Сохранить старые резервные копии и продолжить"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:306
@@ -41123,17 +41320,17 @@
 msgstr "Новый слой изображения из буфера обмена"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Поддерживаемые форматы файлов"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Новый слой изображения из файла..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Невозможно найти объект на карте."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer не в состоянии загрузить или импортировать изображение."
@@ -41147,42 +41344,33 @@
 msgstr "Данные буфера обмена не являются изображением"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "Файл с данными для калибровки рисунка не найден:"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(установите \"{0}\" yes/no/ask в настройках\n"
-"для управления автоматической загрузкой калибровочных данных)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "Хотите применить?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "Загрузить калибровочный файл?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Он будет применен автоматически."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-"Также, с этого момента, калибровочные файлы будут загружаться автоматически."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Установите для \"{0}\" yes/no/ask в настройках для управления\n"
-"автоматической загрузкой калибровочных данных."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -41367,5 +41555,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
 msgid "light_rail"
-msgstr ""
+msgstr "лёгкое_метро"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:81
@@ -41592,9 +41780,9 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:983
 msgid "right hand side"
-msgstr "Праворукая сторона"
+msgstr "Правая сторона"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:994
 msgid "left hand side"
-msgstr "Леворукая сторона"
+msgstr "Левая сторона"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1005
@@ -41780,5 +41968,5 @@
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:78
 msgid "Move tags from ways to relation"
-msgstr ""
+msgstr "Переместить теги с линии на отношение"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:327
@@ -41807,11 +41995,10 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
-msgstr ""
-"Скачать родительские линии/отношения для выбранного отношения и его членов"
+msgid "Download referrers for the chosen relation and its members."
+msgstr ""
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
 msgid "Duplicate relation"
-msgstr ""
+msgstr "Повторяющееся отношение"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java:25
@@ -41840,5 +42027,5 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
-msgstr "Полнростью вернуть пакет правок"
+msgstr "Полностью вернуть пакет правок"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
@@ -41996,5 +42183,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 msgid "Click to add destination."
-msgstr "Нажмите чтобы добавить назначение."
+msgstr "Нажмите, чтобы добавить назначение."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
@@ -42149,4 +42336,5 @@
 msgid "Duplicate hotkey for button ''{0}'' - button will be ignored!"
 msgstr ""
+"Дубликат горячей клавиши для кнопки ''{0}'' - кнопка будет проигнорирована!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:40
@@ -42550,9 +42738,9 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:32
 msgid "Trust OSM Settings"
-msgstr "Доберять настройкам OSM"
+msgstr "Доверять настройкам OSM"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:32
 msgid "Change GPG and privacy settings of the trustosm plugin."
-msgstr "Изменить GPG и личные настройки плагина trustosm"
+msgstr "Изменить GPG и личные настройки модуля trustosm"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:41
@@ -42589,5 +42777,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126
 msgid "Sorry, there are no Signatures for the selected Node."
-msgstr "Извините, нет подписей для выбраной точки"
+msgstr "Извините, нет подписей для выбранной точки"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126
@@ -42603,5 +42791,5 @@
 "{0}"
 msgstr ""
-"Выбраная точка:\n"
+"Выбранная точка:\n"
 "{0}"
 
@@ -42625,5 +42813,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:147
 msgid "Selected WaySegment was:"
-msgstr "Выбраный сегмент:"
+msgstr "Выбранный сегмент:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigExporter.java:26
@@ -42799,7 +42987,25 @@
 msgstr "Создать новый ключ подписи"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
-msgstr "Редактировать ограничения на поворот и длину полосы для выбраного узла"
+msgstr ""
+"Редактировать ограничения на поворот и длину полосы для выбранного узла"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:67
@@ -42891,5 +43097,5 @@
 "relation representing this turn restriction."
 msgstr ""
-"В следующей таблице вы можете редактировать <strong>необработаные теги</"
+"В следующей таблице вы можете редактировать <strong>необработанные теги</"
 "strong>, внутри отношения OSM, определяющего данное ограничение на поворот."
 
@@ -42899,5 +43105,5 @@
 "OSM relation representing this turn restriction."
 msgstr ""
-"В следующей таблице вы можете редактировать <strong>необработаных "
+"В следующей таблице вы можете редактировать <strong>необработанных "
 "участников</strong>, внутри отношения OSM, определяющего данное ограничение "
 "на поворот."
@@ -42969,5 +43175,5 @@
 msgid "Show errors and warnings related to this turn restriction"
 msgstr ""
-"Показать ошибки и предупреждения, относящиеся к даннному ограничению на "
+"Показать ошибки и предупреждения, относящиеся к данному ограничению на "
 "поворот"
 
@@ -43036,15 +43242,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
-"Это ограничение на поворот относится к объекту, который был удалён за "
-"пределами этого редактора ограничения на поворот:"
 msgstr[1] ""
-"Это ограничение на поворот относится к  {0} объектам, которые были удалены "
-"за пределами этого редактора ограничения на поворот:"
-msgstr[2] ""
-"Это ограничение на поворот относится к  {0} объектам, которые были удалены "
-"за пределами этого редактора ограничения на поворот:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -43310,6 +43509,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Открыть редактор для выделенного ограничения на поворот"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43380,5 +43579,5 @@
 msgid "Please select the set of road sign icons to be used in the plugin."
 msgstr ""
-"Пожалуйста выберите набор пиктограмм дорожных знаков, который будет "
+"Пожалуйста, выберите набор пиктограмм дорожных знаков, который будет "
 "использоваться в модуле."
 
@@ -43545,5 +43744,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
 msgid "Please go to the Basic editor and manually choose a way."
-msgstr "Пожалуйста перейдте в простой редактор и в ручную выберите путь."
+msgstr "Пожалуйста, перейдите в простой редактор и вручную выберите путь."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
@@ -43575,5 +43774,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:33
 msgid "Go to the Advanced Editor and add via objects"
-msgstr "Репейдите к расширенному редактированию и добавьте объекты \"через\""
+msgstr "Перейдите к расширенному редактированию и добавьте объекты \"через\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
@@ -43613,5 +43812,5 @@
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
 msgstr ""
-"Перейдите к Основному редактору и выберите исключения из стандарных типов "
+"Перейдите к Основному редактору и выберите исключения из стандартных типов "
 "транспорта"
 
@@ -43732,5 +43931,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:112
 msgid "Close dialog and cancel"
-msgstr "Зактрыть диалог и отменить"
+msgstr "Закрыть диалог и отменить"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168
@@ -43767,9 +43966,9 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:46
 msgid "Extract node"
-msgstr ""
+msgstr "Извлечь точку"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:34
 msgid "Extracts node from a way"
-msgstr ""
+msgstr "Извлечь точку из линии"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:45
@@ -43778,8 +43977,10 @@
 "selected."
 msgstr ""
+"Этот инструмент извлекает точку из линии и требует чтобы была выбрана одна "
+"точка."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:67
 msgid "Extract node from line"
-msgstr ""
+msgstr "Извлечь точку из линии"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
@@ -43814,5 +44015,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:85
 msgid "Symmetry"
-msgstr ""
+msgstr "Симметрия"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
@@ -43821,4 +44022,6 @@
 "mirror."
 msgstr ""
+"Пожалуйста, выберите, по крайней мере, две точки для оси симметрии и что-то "
+"еще для отражения."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -43847,5 +44050,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:20
 msgid "Align Way Nodes"
-msgstr "Выравнять точки пути"
+msgstr "Выровнять точки пути"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:24
@@ -43904,9 +44107,9 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:24
 msgid "Split adjacent ways"
-msgstr ""
+msgstr "Разделить смежные линии"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:27
 msgid "Split adjacent ways on T-intersections"
-msgstr ""
+msgstr "Разделить смежные линии на Т-пересечении"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:68
@@ -43915,4 +44118,6 @@
 "participating in this operation."
 msgstr ""
+"Есть несколько линий, содержащих одну из разделяющих точек. Выберите линии, "
+"участвующие в этой операции."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:19
@@ -43945,6 +44150,6 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
-msgstr "Будут выбраны примыкающие линии. Выделение с точек будет снято."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java:23
@@ -44161,13 +44366,13 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:181
 msgid "no deinterlacing"
-msgstr "без деинтерлейзинга"
+msgstr "без деинтерлейcинга"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:186
 msgid "deinterlacing using line doubling"
-msgstr "дейнтерлейзить используя дублирование строк"
+msgstr "деинтерлейсинг с использованием дублирования строк"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:191
 msgid "deinterlacing using linear interpolation"
-msgstr "деинтерлейзить используя линейную интерполяцию"
+msgstr "деинтерлейсинг с использованием линейной интерполяции"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:282
@@ -44304,5 +44509,5 @@
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
-msgstr "Точка ''{0}'' это соединение более, чем 2 пересекающихся линий."
+msgstr "Точка ''{0}'' это соединение более чем 2 пересекающихся линий."
 
 #. search field
@@ -44343,4826 +44548,87 @@
 #: ../plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java:43
 msgid "Drive a race car on this layer"
-msgstr "Двигающейся автомобиль на этом слое"
-
-#~ msgid "No data imported."
-#~ msgstr "Данные не импортированы"
-
-#~ msgid "File could not be found."
-#~ msgstr "Файл не найден"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Неизвестное расширение файла."
-
-#~ msgid "Email"
-#~ msgstr "Электронная почта"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Несохранённые изменения"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Соединение с OSM сервером..."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM пароль"
-
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестная версия"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Подготовка данных..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Неправильный пароль или имя пользователя."
-
-#~ msgid "Aborting..."
-#~ msgstr "Прерывание..."
-
-#~ msgid "Enter Password"
-#~ msgstr "Введите пароль"
-
-#~ msgid "position"
-#~ msgstr "положение"
-
-#~ msgid "different"
-#~ msgstr "различный"
-
-#~ msgid "true"
-#~ msgstr "истина"
-
-#~ msgid "false"
-#~ msgstr "ложь"
-
-#~ msgid "Change"
-#~ msgstr "Изменить"
-
-#~ msgid "Move"
-#~ msgstr "Переместить"
-
-#~ msgid "Next Marker"
-#~ msgstr "Следующий маркер"
-
-#~ msgid "Jump back."
-#~ msgstr "Перемотать назад."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Предыдущий маркер"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Играть медленнее."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Введите значения для всех конфликтов."
+msgstr "Вести гоночный автомобиль на этом слое"
+
+#~ msgid "Change values?"
+#~ msgstr "Изменить значения?"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Оставить их координаты"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Оставить мои координаты"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Загрузка на сервер отменена"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "У выделенных линий различается участие в отношениях. Всё равно хотите их "
-#~ "объединить?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Все линии были пустыми"
-
-#~ msgid "gps track description"
-#~ msgstr "описание трека GPS"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Открыть в браузере историю изменений выделенного объекта."
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Выделенный объект \"{0}\" используется отношением \"{1}\" в роли "
-#~ "\"{2}\".\n"
-#~ "Удалить из отношения?"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Выделенный объект \"{0}\" используется отношением \"{1}\".\n"
-#~ "Удалить из отношения?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Конфликтующее отношение"
-
-#~ msgid "Split way segment"
-#~ msgstr "Разделить сегмент линии"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Ошибка при загрузке страницы {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Открыть в браузере"
-
-#~ msgid "Create a new map."
-#~ msgstr "Создать новую карту."
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Невозможно переименовать файл \"{0}\"."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Изменить настройки программы"
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "При сохранении возникла ошибка."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Невозможно создать резервную копию."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Пожалуйста, введите строку для поиска."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Отсутствует закрывающая скобка"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Загрузить эти изменения?"
-
-#~ msgid "Uploading data"
-#~ msgstr "Загрузка данных"
-
-#~ msgid "Rotate"
-#~ msgstr "Вращать"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Разрешить {0} конфликтов в {1} объектах"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Удалить {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Удалить {1} {0}"
-
-#~ msgid "my version:"
-#~ msgstr "моя версия:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} объект имеет конфликты."
-#~ msgstr[1] "{0} объекта имеет конфликты."
-#~ msgstr[2] "{0} объектов имеет конфликты."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Разрешить конфликты"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Разрешение конфликтов."
-
-#~ msgid "their version:"
-#~ msgstr "их версия:"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Нажмите \"Обновить\" для обновления списка"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ещё не реализовано."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Присутствуют несохранённые изменения. Всё равно удалить слой?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Вы действительно хотите удалить весь слой?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Объединить выделенный слой с нижележащим."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Тэги (пустое значение удаляет тэг)"
-
-#~ msgid "Add Selected"
-#~ msgstr "Добавить выбранное"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Пожалуйста, введите название места."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Источники и типы данных"
-
-#~ msgid "to"
-#~ msgstr "до"
-
-#~ msgid "x from"
-#~ msgstr "x от"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
-
-#~ msgid "y from"
-#~ msgstr "y от"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Изображения для {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Прочесть GPX"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Начало GPS: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Конец GPS: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "изображение"
-#~ msgstr[1] "изображения"
-#~ msgstr[2] "изображений"
-
-#~ msgid "timezone difference: "
-#~ msgstr "разница в часовых поясах: "
-
-#~ msgid "Sync clock"
-#~ msgstr "Синхронизация часов"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Введённое время невозможно использовать"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
-
-#~ msgid "Length: "
-#~ msgstr "Длина: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Временной интервал: "
-
-#~ msgid "name"
-#~ msgstr "название"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "точка"
-#~ msgstr[1] "точки"
-#~ msgstr[2] "точек"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} точка"
-#~ msgstr[1] "{0} точки"
-#~ msgstr[2] "{0} точек"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Невозможно связаться с сервером."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "При импортировании возникли конфликтные ситуации."
-
-#~ msgid "Set the language."
-#~ msgstr "Установить язык."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Параметры читаются в том порядке, в котором указаны, поэтому\n"
-#~ "убедитесь, что загружаете данные перед --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
-
-#~ msgid "File not found"
-#~ msgstr "Файл не найден"
-
-#~ msgid "Download List"
-#~ msgstr "Скачать список"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Сохранять резервные копии"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Ошибка чтения файла с описанием модуля: {0}"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Все установленные модули имеют последнюю версию."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Версия {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Обновить следующие модули:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Скачать следующие модули?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Адрес"
-
-#~ msgid "Anonymous"
-#~ msgstr "Анонимный"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Порт"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Пароль"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Основной адрес сервера OSM (REST API)"
-
-#~ msgid "Base Server URL"
-#~ msgstr "Основной адрес сервера"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Использовать настройки по умолчанию"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Найден элемент <nd> вне пути."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Недопустимый объект с id=0"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Открывается список правок..."
-
-#~ msgid "Commit comment"
-#~ msgstr "Комментарий правки"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
-#~ "повторите попытку позже."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Отсутствует необходимый атрибут \"{0}\"."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Со следующими модулями возникли проблемы:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Внимание - произошёл запрос на загрузку модуля {0}. Этот модуль больше не "
-#~ "требуется."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr ""
-#~ "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Обновить модули"
-
-#~ msgid "Do not show again"
-#~ msgstr "Больше не показывать"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
-
-#~ msgid "Open an other photo"
-#~ msgstr "Открыть другое фото"
-
-#~ msgid "All images"
-#~ msgstr "Все изображения"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Слой сетки"
-
-#~ msgid "Grid layout"
-#~ msgstr "Разметка сетки"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Вращение сетки"
-
-#~ msgid "World"
-#~ msgstr "Мир"
-
-#~ msgid "Boat"
-#~ msgstr "Лодка"
-
-#~ msgid "Motorboat"
-#~ msgstr "Моторная лодка"
-
-#~ msgid "Goods"
-#~ msgstr "Грузовик (до 3.5т)"
-
-#~ msgid "Cycleway"
-#~ msgstr "Велодорожка"
-
-#~ msgid "Footway"
-#~ msgstr "Тротуар"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Грунтовка 3 класса"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Грунтовка 1 класса"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Грунтовка 2 класса"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Грунтовка 4 класса"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Грунтовка 5 класса"
-
-#~ msgid "Station"
-#~ msgstr "Станция"
-
-#~ msgid "rugby"
-#~ msgstr "рэгби"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Выбирать, двигать и вращать объекты"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Обновить список выбранного."
-
-#~ msgid "zoom level"
-#~ msgstr "масштаб"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Загрузить все изменения на OSM"
-
-#~ msgid "Accomodation"
-#~ msgstr "Проживание"
-
-#~ msgid "Football"
-#~ msgstr "Американский футбол"
-
-#~ msgid "Occupied By"
-#~ msgstr "Объект"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Править отношение #{0}"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Перемещайте сегмент линии, чтобы образовать прямоугольник"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Править новое отношение"
-
-#~ msgid "Create new relation"
-#~ msgstr "Создать новое отношение"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "EXIF файла \"{0}\" не содержит информации о времени."
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Пожалуйста, выберите ровно три точки, или линию, состоящую ровно из трёх "
-#~ "точек."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
-#~ "создайте отчёт об ошибке."
-
-#~ msgid "Faster Forward"
-#~ msgstr "Играть быстрее."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Выделенные точки участвуют в различных отношениях. Всё равно хотите "
-#~ "объединить?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Объединить точки из разных отношений?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Не удаётся объединить точки: пришлось бы удалить линию, которая еще "
-#~ "используется."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Дублировать {0} точек в {1} точек"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Не применять изменения"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Не найдено изображений с информацией о времени."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Включение обновлённых модулей"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Ошибка при включении обновлённых модулей. Убедитесь, что JOSM имеет "
-#~ "разрешение переписывать существующие модули."
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Горячие клавиши назначаются при запуске JOSM. Пэтому, нужно "
-#~ "<b>перезапустить</b> JOSM, чтобы изменения вступили в силу.</p>"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Кроме того, горячие клавиши активируются, если назначаются для какого-"
-#~ "либо меню, или кнопки впервые. Поэтому некоторые из них могут заработать "
-#~ "без перезапуска --- но и без разрешения конфликтов. Это ещё один повод "
-#~ "<b>перезапустить</b> JOSM после внесения любых изменений.</p>"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Спасибо за понимание</p>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>На последней вкладке указаны клавиши-модификаторы, которые JOSM "
-#~ "автоматически назначит для горячих клавиш. Для каждой из четырёх групп "
-#~ "горячих клавиш есть по три варианта модификаторов. При разрешении "
-#~ "конфликтов, эти варианты будут проверяться в указанном порядке. Если все "
-#~ "варианты окажутся уже заняты, будет назначено случайное сочетание клавиш."
-#~ "</p>"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Я нахожусь в часовом поясе: "
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Я могу сфотографировать экран GPS приёмника.<br>Это поможет?</html>"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Дублировать выбранные линии."
-
-#~ msgid "Jump forward"
-#~ msgstr "Перемотать вперёд"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Точки не расположены по кругу"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Связаться с {0}..."
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Отсутствуют параметры для \"ИЛИ\""
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Отсутствуют параметры для \"НЕ\""
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
-
-#~ msgid "resolved version:"
-#~ msgstr "Разрешённая версия:"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Гидротехнические сооружения"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Данный тест проверяет, если две линии (дороги, железные дороги, водоёмы) "
-#~ "пересекаются на одном слое, но не имеют общей точки."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Для работы модуля нужна более новая версия JOSM: {0}."
-
-#~ msgid "Preparing..."
-#~ msgstr "Подготовка..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Откатить состояние выбранных объектов до версии, указанной в списке "
-#~ "правок."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Ошибка при скачивании модуля: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Модуль уже существует"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr "<p>Псевдо-модификатор 'отключено' отключает горячую клавишу.</p>"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Зоны Ламберта (Франция)"
-
-#~ msgid "S"
-#~ msgstr "Ю"
-
-#~ msgid "N"
-#~ msgstr "С"
-
-#~ msgid "W"
-#~ msgstr "З"
-
-#~ msgid "E"
-#~ msgstr "В"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Некоторые точки - (почти) на одной линии"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Используется проекция EPSG:4326, что может привести<br>к "
-#~ "нежелательным результатам при выравнивании углов.<br>Измените проекцию, "
-#~ "чтобы это предупреждение больше не появлялось.<br>Всё равно продолжить?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Выбрана только одна точка"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
-#~ "функции."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Использовать десятичные градусы"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Введите координаты новой точки"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Отрицательные значения обозначают западное/южное полушарие"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Создать копию линии"
-
-#~ msgid "change the viewport"
-#~ msgstr "изменить область просмотра на экране"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "подтверждать все действия удалённого управления вручную."
-
-#~ msgid "load data from API"
-#~ msgstr "загрузить данные из API"
-
-#~ msgid "change the selection"
-#~ msgstr "изменить выделение"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Модуль, позволяющий другим приложениям управлять JOSM"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Разрешённые действия"
-
-#~ msgid "near"
-#~ msgstr "возле"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Настройки модуля дистанционного управления"
-
-#~ msgid "zoom"
-#~ msgstr "масштаб"
-
-#~ msgid "Grid"
-#~ msgstr "Сетка"
-
-#~ msgid "WMS URL"
-#~ msgstr "Ссылка на WMS"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Измениить список серверов WMS, отображаемых в меню модуля WMS"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Подстроить положение слоя WMS"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Справка по модулю WMS"
-
-#~ msgid "Help / About"
-#~ msgstr "Справка / О модуле"
-
-#~ msgid "Navigation"
-#~ msgstr "Навигация"
-
-#~ msgid "Amenities"
-#~ msgstr "Удобства"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Подъёмный мост"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Править туризм"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Править продвинутый горный туризм"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Альпийский туризм"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Править альпийский туризм"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Горный туризм"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Править горный туризм"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Продвинутый горный туризм"
-
-#~ msgid "park_and_ride"
-#~ msgstr "перехватывающая"
-
-#~ msgid "Edit Station"
-#~ msgstr "Править станцию"
-
-#~ msgid "Shop"
-#~ msgstr "Магазин"
-
-#~ msgid "citymap"
-#~ msgstr "карта города"
-
-#~ msgid "hikingmap"
-#~ msgstr "карта туристических маршрутов"
-
-#~ msgid "map"
-#~ msgstr "карта"
-
-#~ msgid "bicyclemap"
-#~ msgstr "карта велодорожек"
-
-#~ msgid "board"
-#~ msgstr "доска информации"
-
-#~ msgid "Rugby"
-#~ msgstr "Регби"
-
-#~ msgid "unitarianist"
-#~ msgstr "унитаризм"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "подложка Geofabrik.de"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Сервер не поддерживает управление версиями"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Можно указать, с каким промежутком в днях будет появляться<br>данное "
-#~ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Изменить параметры"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Открыть файл (как данные GPS, если .gpx)"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Группа настроек ''{0}''"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Невозможно создать баг. Результат: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Вы действительно желаете отметить проблему, как решённую?"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} модуль успешно обновлён. Пожалуйста, перезапустите JOSM."
-#~ msgstr[1] "{0} модуля успешно обновлено. Пожалуйста, перезапустите JOSM."
-#~ msgstr[2] "{0} модулей успешно обновлено. Пожалуйста, перезапустите JOSM."
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Удалить \"{0}\" для {1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Удалить \"{0}\" для {1} ''{2}''"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Сделать все выбранные объекты участниками отношения"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Удалить текущего участника из отношения"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Объединить линии, входящие в разные отношения?"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Участие в отношениях было применено ко всем новым линиям.\n"
-#~ "Проверьте, и при необходимости внесите корректировки."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Удалить Участника Отношения"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Участники: {0}"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Попытайтесь обновиться до новейшей версии модуля перед созданием отчёта "
-#~ "об ошибке."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Найден тэг <member> вне отношения."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Неверный номер точки"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>Внимание! Пароль хранится в открытом виде в файле настроек.<br> "
-#~ "Пароль передаётся по сети в открытом виде, как параметр запроса.<br><b>Не "
-#~ "используйте ценный пароль.</b></html>"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Ошибка соединения с адресом: \"{0}\""
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Скачать трансформированное изображение с WMS сервера Metacarta"
-
-#~ msgid "Portcullis"
-#~ msgstr "Опускающаяся решётка"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Пожалуйста, создайте отчёт об ошибке по адресу {0}"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Прикрепите следующую информацию к отчёту:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Укажите последовательность деййствий, которая вызвала ошибку (как можно "
-#~ "подробнее!)"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Проекция \"{0}\" разработана только\n"
-#~ "для широт между 46.1° и 57°.\n"
-#~ "Используйте другую проекцию, если не пользуетесь\n"
-#~ "французским сервером WMS. Не загружайте \n"
-#~ "никаких данных на сервер после этого сообщения."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Загрузить на OSM..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Настроить сайты..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Архив с модулем уже существует. Скачать текущую версию и удалить "
-#~ "существующий архив?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Невозможно скачать модуль: {0} из {1} доступных"
-
-#~ msgid "Error during parse."
-#~ msgstr "Ошибка при разборе."
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Произошла неожиданная ошибка.\n"
-#~ "\n"
-#~ "Это всегда говорит об ошибке в коде программы. Если Вы пользуетесь\n"
-#~ "последней версией JOSM, будьте добры, отправьте отчёт об ошибке."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Градусы, минуты, секунды"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Пожалуйста, выберите как минимум две точки для объединения."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Нет открытых документов. Нечего сохранять."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "При восстановлении из резервной копии возникла ошибка."
-
-#~ msgid "Play previous marker."
-#~ msgstr "Воспроизвести предыдущий маркер"
-
-#~ msgid "Play next marker."
-#~ msgstr "Воспроизвести следующий маркер"
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Ошибка разбора ссылки: \"{0}\""
-
-#~ msgid "Load Selection"
-#~ msgstr "Загрузить выделенное"
-
-#~ msgid "Data Layer"
-#~ msgstr "Слой данных"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Online-справка по JOSM"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Ошибка разбора"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Невозможно прочитать закладки"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Невозможно записать закладки"
-
-#~ msgid "Download Area"
-#~ msgstr "Область для скачивания"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Пожалуйста, введите сначала желаемые координаты"
-
-#~ msgid "layer not in list."
-#~ msgstr "слоя нет в списке."
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "трек с {0} точкой"
-#~ msgstr[1] "трек с {0} точками"
-#~ msgstr[2] "трек с {0} точками"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} удалено)"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} состоит из {1} трека"
-#~ msgstr[1] "{0} состоит из {1} треков"
-#~ msgstr[2] "{0} состоит из {1} треков"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Нет указания времени для точки {0} x {1}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "текущая разница: {0} с."
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} в пределах трека"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Невозможно прочесть дату из файла \"{0}\""
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Максимальное расстояние (в метрах), соединяемое линиями. Установите -1, "
-#~ "чтобы отображать все линии."
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Вы можете заметить, что в списке выбора клавиш на следующей вкладке "
-#~ "есть все клавиши со всех типов клавиатур, известных Java, а не только те "
-#~ "клавиши, что есть на Вашей клавиатуре. Пожалуйста, используйте только те "
-#~ "значения, которые соответствуют клавишам, присутствующим на Вашей "
-#~ "клавиатуре. Поэтому, если на ней нет клавиши 'Copy' (она есть только на "
-#~ "клавиатурах от Sun), то не используйте её. Также в списке есть клавиши, "
-#~ "соответствующие значению в верхнем регистре (например, ':'/двоеточие). "
-#~ "Пожалуйста, не используйте их тоже. Используйте только основную клавишу"
-#~ "(';'/точка с запятой для английской раскладки, либо '6' для русской). В "
-#~ "противном случае могут возникать конфликты, так как в программе JOSM в "
-#~ "английской раскладке Ctrl+Shift+; и Ctrl+: это одно и то же сочетание.</p>"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Имя пользователя OSM (e-mail)"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Параметры прокси-сервера"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Использовать прокси-сервер"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Ошибка при разборе ответа от сервера."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Показать/скрыть текст/значки"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Произошла ошибка."
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Трек GPX загружен"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Задайте строку для поиска"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Ошибка разбора: неправильная структура документа gpx"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "у <nd> нет ссылок ref"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Масштабирование: Колесо прокрутки или двойной щелчок.  Сдвинуть карту: "
-#~ "Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок."
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Ошибка: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Предупреждение: {0}"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Проверить выделенное, либо все загруженные данные"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Сбой при импорте NMEA!"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Неправильно составленные предложения: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Неизвестные предложения: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Ошибки контрольных сумм: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Пустые координаты: "
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Возможно только редактирование справочных страниц JOSM Online Help"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Авторы: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Слои: {0}"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше "
-#~ "интернет-соединение."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Конфликты: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Файл настроек поврежден. Восстанавливаем из старой копии в {0}."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Не удается прочитать каталог с настройками: {0}"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Не удается получить результаты поиска"
-
-#~ msgid "Painting problem"
-#~ msgstr "Проблемы отображения"
-
-#~ msgid "error loading metadata"
-#~ msgstr "ошибка загрузки метаданных"
-
-#~ msgid "image not loaded"
-#~ msgstr "изображение не загружено"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Один из выбранных файлов пуст!"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Пожалуйста, выберите пользователя в панели авторов"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Извините, для анонимных пользователей это недоступно"
-
-#~ msgid "Please select some data"
-#~ msgstr "Пожалуйста, выберите данные"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Настройки модуля WMS"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Открыть окно OpenStreetBugs, и включить автоматическое скачивание"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr "Модуль {0} поврежден, либо не скачался автоматически"
-
-#~ msgid "History of Element"
-#~ msgstr "История элемента"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Синхронизировать время с GPS приёмником"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Стек команд: {0}"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Источник (URL или имя файла) файла с предустановками тегов. См. http://"
-#~ "josm.openstreetmap.de/wiki/TaggingPresets для большей информации."
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Добавить новый источник предустановки тегов в список."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Источники предустановок тегов"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Источник предустановок тегов"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Модуль {0} требуется модулю {1}, но не найден."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Неизвестная роль «{0}»."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Стиль для ограничения {0} не найден."
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' и 'Street' в любом ключе или названии."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' в любом месте названия."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - название не содержит 'Bak'."
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Используйте <b>\"</b> чтобы заключить в кавычки операторы (например, если "
-#~ "ключ содержит двоеточие)"
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - объект с заданным ID"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Импортировать файл TCX как трек GPS"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Индекс направления '{0}' не найден"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Импортировать файл TCX..."
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Установить {0}={1} для {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Установить {0}={1} для {2} {3}"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Создать не звуковые маркеры при обработке GPX данных"
-
-#~ msgid "OpenLayers"
-#~ msgstr "ОткрытыеСлои"
-
-#~ msgid "start"
-#~ msgstr "старт"
-
-#~ msgid "end"
-#~ msgstr "конец"
-
-#~ msgid "Public"
-#~ msgstr "Публичный"
-
-#~ msgid "intermedia"
-#~ msgstr "средний"
-
-#~ msgid "advance"
-#~ msgstr "продвинутый"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Количество кабелей"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Редактировать магазин напитков"
-
-#~ msgid "Request Update"
-#~ msgstr "Запросить обновление"
-
-#~ msgid "error requesting update"
-#~ msgstr "ошибка при запросе обновления"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Загрузить изображение с французского Cadastre WMS"
-
-#~ msgid "Zone"
-#~ msgstr "Зона"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Зона Ламберта"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Открыть страницу пользователя в браузере"
-
-#~ msgid "Open User Page"
-#~ msgstr "Открыть страницу пользователя"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Введите имя пункта меню и URL этого WMS"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (по умолчанию)"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Пожалуйста, выберите ряд для копирования."
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Сохранить и выйти"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Удалить все выделенные объекты из связей"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Удалить выбранные"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Удалить слой"
-
-#~ msgid "optician"
-#~ msgstr "оптика"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Редактор отношений: {0}"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Разрешить конфликт"
-
-#~ msgid "Move Down"
-#~ msgstr "Переместить вниз"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Удалить и скачать"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Скачать модули"
-
-#~ msgid "Move Up"
-#~ msgstr "Переместить вверх"
-
-#~ msgid "Update Data"
-#~ msgstr "Обновить данные"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "Обновить слой данных с сервера (скачать данные заново)"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Править грунтовку 1 класса"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Править грунтовку 2 класса"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Править грунтовку 3 класса"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Править грунтовку 4 класса"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Править грунтовку 5 класса"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Продвинутый альпийский туризм"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Править продвинутый альпийский туризм"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Сложный альпийский туризм"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Править сложный альпийский туризм"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Править подъёмный мост"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Править опускающуюся решётку"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Объединить в любом случае"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Не найдено данных для обновления. Вы уже открыли скачанный слой данных?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Эта ошибка вызвана в течении массовой загрузки:"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Это действие потребует {0} персонифицированного запроса на скачивание. Вы "
-#~ "желаете продолжить?"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr ""
-#~ "Проекция не может быть прочитана из настроек. Используется EPSG:4326"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Пожалуйста выберите хотя бы один узел, путь или зависимость. Только у уже "
-#~ "загруженных элементов есть история."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Цвета точек и сегментов трека по уровню снижения горизонтальной точности "
-#~ "(HDOP). Ваше устройство должно журналировать эту информацию."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Переключить в Полноэкранный режим"
-
-#~ msgid "Full Screen"
-#~ msgstr "Полноэкранный режим"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её в<A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её в <A HREF=\"{0}\">english</A> "
-#~ "или <A HREF=\"{1}\">вашем языке</A>."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org"
-
-#~ msgid "No password provided."
-#~ msgstr "Нет пароля"
-
-#~ msgid "No username provided."
-#~ msgstr "Нет имени пользователя"
-
-#~ msgid "Update position for: "
-#~ msgstr "Обновление позиции для: "
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Изображения без координат в заголовках Exif"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Разница во времени {0} дней)"
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы "
-#~ "можете настроить вручную с помощью ползунов соответствие фотографиям."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Смещение между треком и фотографией: {0}м {1}с"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите "
-#~ "другой."
-
-#~ msgid "Default Values"
-#~ msgstr "Значения по умолчанию"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert зона 4 кэш файл (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert зона 1 кэш файл (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert зона 3 кэш файл (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert зона 21 кэш файл (.2)"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Город {0} не найден или не сдоступен в WMS.\n"
-#~ "Пожалуйста проверьте его доступность на www.cadastre.gouv.fr"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Изменение проекции на {0} в первую очередь."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Неправильная проекция"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Выберите Таблицу d'Assemblage"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "Для включения кадастрового WMS плагина, измените\n"
-#~ "в JOSM проекцию на Ламберта и перезапустите"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Править справочное бюро"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Столб с указателями (туризм)"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "Пропуск линии потому, что она включает в себя узлы, которые не "
-#~ "существуют: {0}\n"
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Множитель скачанного изображения"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Установить вручную Ламберт зоны (например, для места между двумя зонами)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Открыть сначала слой (GPX, OSM, кэш)"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Добавить новый слой"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Центр растра: {0}"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Сетка основного местонахождения"
-
-#~ msgid "Add grid"
-#~ msgstr "Добавить сетку"
-
-#~ msgid "osmarender options"
-#~ msgstr "Настройки osm рендера"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Удалить узлы маршрутизации"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Щелкните и перетащите для перемещения узлов маршрутизации"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Щелкните для добавления узлов маршрутизации"
-
-#~ msgid "Start routing"
-#~ msgstr "Начать маршрутизацию"
-
-#~ msgid "Fade background: "
-#~ msgstr "Бледный фон: "
-
-#~ msgid "requested: {0}"
-#~ msgstr "предлагается: {0}"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Особый обработчик на французском кадастр WMS сервете на www.cadastre.gouv."
-#~ "fr <BR> <BR> Пожалуйста, прочитайте условия использования здесь (по-"
-#~ "французски): <br> <A HREF = \"http://www. cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html \"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html </A> <BR> до загрузки каких-либо "
-#~ "данных, созданный этим плагином ."
-
-#~ msgid "<multiple>"
-#~ msgstr "<множественный>"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Продолжить в любом случае"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Заменить выбранное данными пользователя"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Выбрать данные пользователя"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Показать панель автора"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте "
-#~ "перед загрузкой."
-
-#~ msgid "Fix relations"
-#~ msgstr "Исправить отношения"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Пересечения найдено. Ничего не изменялось."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr ""
-#~ "Пожалуйста, выберите по крайней мере, одну замкнутую линию, которые "
-#~ "должны быть объединены."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены."
-
-#~ msgid "Closed Way"
-#~ msgstr "Замкнутая линия"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Проверить содержит ли нарисованная карта ошибки данных"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Вы можете добавлять, редактировать и удалять записи WMS на закладке  "
-#~ "WMSplugin в установках - тогда они будут отображаться в меню WMS.\n"
-#~ "\n"
-#~ "Вы также можете сделать это вручную в Расширенных настройках, используя "
-#~ "следующую схему:\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"
-#~ "Пример полного формата  WMS URL (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"
-#~ "Для карты Metacarta  Rectifier http://labs.metacarta.com/rectifier/, вам "
-#~ "нужно всего лишь ввести соответствующие \"ID\".\n"
-#~ "Чтобы добавить карту Metacarta Rectifier нужно в меню вручную создать "
-#~ "URL, как в этом примере, вместо 73 с 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"
-#~ "Примечание: Убедитесь, что изображение согласовано с координатам, если "
-#~ "есть сомнения в лицензионных правах на изображение, то не используйте его."
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Отрегулируйте положение выбранного слоя WMS"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "ID изобрадения карты Metacarta Rectifier"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "выпрямитель id={0}"
-
-#~ msgid "Copy Default"
-#~ msgstr "Копия поумолчанию"
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr "Особый обработчик на WMS-сервере французского земельного кадастра."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Главная особенность плагина является возможность удаления точек на GPX "
-#~ "треке. Этот плагин может быть использован для подготовки треков для "
-#~ "загрузки на OSM. Например, удалить неинтересные части трека."
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Имитирует щелчок, когда вы делаете нажатие и недалеко перетаскиваете. Это "
-#~ "полезно для ручки планшета, когда у вас есть проблемы, то просто нажав на "
-#~ "ручке без перемещения мыши (основная Java-планшет проблема)."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Инструменты для работы с авторами / пользователями. Выбирайте данные на "
-#~ "карте, которые принадлежат отдельным пользователем, откроется браузер со "
-#~ "страницей профиля выбранного автора."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Прямо загрузить TCX файлы из JOSM."
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Макс. Длина (метры)"
-
-#~ msgid "Map Type"
-#~ msgstr "Тип карты"
-
-#~ msgid "Board Type"
-#~ msgstr "Тип Инфорационного Щита"
-
-#~ msgid "Charge"
-#~ msgstr "Переодевание"
-
-#~ msgid "sports"
-#~ msgstr "Спортивный"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- сейчас запущена версия {0}"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Картинка {0}  не существует или произошла ошибка чтения."
-
-#~ msgid "linked"
-#~ msgstr "присоединенный"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Максимальная длина линий (в метрах) для локальных файлов. Установите -1 "
-#~ "чтобы рисовать все линии."
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "Соединение с {0} установлено используя протокол {1}"
-
-#~ msgid "Not initialized"
-#~ msgstr "Не инициализированно"
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Выгрузка прервана по неизвестной причине"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Не возможно прочесть числовое знаечение из ответа"
-
-#~ msgid "More details"
-#~ msgstr "Подробнее"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Версия неизвестна: {0}"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Поддерживает протокол версии 0.5 и 0.6, тогда как сервер сообщает о "
-#~ "поддержке {0} до {1}."
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Номер версии отсутствует по  данным OSM"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Проекция \"{0}\" разработана только для\n"
-#~ "широт между 45.7° и 47.9° и долгот между 5.7° и 10.6°.\n"
-#~ "Если Вы не работаете над данными,\n"
-#~ "относящимися к  Швейцарии либо Лихтенштену, \n"
-#~ "воспользуйтесь другой системой проекции .\n"
-#~ "Не делайте выгрузку данных после данного сообщения."
-
-#~ msgid "% of lat:"
-#~ msgstr "% широты:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% долготы:"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Невозможно прочитать вид проекции из настроек. Используется проекция "
-#~ "Меркатора"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Невозможно прочитать вид проекции из настроек. Используется проекция "
-#~ "Меркатора"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Да, восстановить их тоже"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Нет, отменить действие"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\">английском</"
-#~ "A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\"> английском "
-#~ "</A> или <A HREF=\"{1}\">вашем языке</A>."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Проверка существования узла {0} в прошлом..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Восстановление удаленного отношения..."
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Восстановление удаленного пути..."
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Проверка существования примитива {0} в прошлом..."
-
-#~ msgid "Update Selection"
-#~ msgstr "Обновить выборку"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Не могу найти примитив с ID {0} в текущем источнике данных"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Прошущен примитив"
-
-#~ msgid "Update failed"
-#~ msgstr "Ошибка обновления"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Ошибка обновления выбранного примитива."
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Примитив удаляется на сервере"
-
-#~ msgid "Selection too big"
-#~ msgstr "Выборка слишком большая"
-
-#~ msgid "Uploading"
-#~ msgstr "Выгрузка"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Обнаружен конфликт"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Ошибка  связи с сервером."
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>OSM примитив с id <strong>{0}</strong> был удален<br>с сервера "
-#~ "другим картографом.<br><br>Нажмите <strong>{1}</strong> для сохранения "
-#~ "вашего примитива и игнорирования попытки удаления.<br> Ваш примитив будет "
-#~ "добавлен с новым id.<br>Нажмите <strong>{2}</strong> для согласия с "
-#~ "удалением примитива, (ваш примитив будет удален).<br>Нажмите <strong>{3}</"
-#~ "strong> для отмены.<br>"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Синхронизированы только {0} {1}"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Ошибка создания подключения к серверу OSM {0}.\n"
-#~ "Проверьте в настройках URL сервера  и наличие подключения к сети Internet."
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Следующие ошибки произошли во время массового скачивания:"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Выбрано  <strong>{0}</strong> примитивов <br>для индивидуального "
-#~ "обновления. Пожалуйста, уменьшите выделение <br>до макс. {1} примитивов.</"
-#~ "html>"
-
-#~ msgid "Keep mine"
-#~ msgstr "Сохранить мои"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "неожиданное возвращённое значение. Получено {0}"
-
-#~ msgid "Delete mine"
-#~ msgstr "Удалить мои"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Неверное число параметров для оператора точек."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Неверное значение id оператора: {0}. Ожидалось число."
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "Изменить роль участника отношений"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - ключ 'type' с точным значением 'route'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - ключ 'type' с любым значением. Также попробуйте "
-#~ "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Примитив  с id {0} не был найден в этом наборе данных"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr ""
-#~ "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "параметр ''{0}'' не должен быть null"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "более поздняя версия не найдена. История пуста."
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "более ранняя версия не найдена. История пуста."
-
-#~ msgid "API initialization failed"
-#~ msgstr "Сбой инициализации API"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Текущее число изменений превысило максимальное, текущее - {0}, "
-#~ "максимальное - {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
-
-#~ msgid "changeset"
-#~ msgstr "набор изменений"
-
-#~ msgid "changesets"
-#~ msgstr "наборы изменений"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "роль {0} не участвует в паре сравнения {1}"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "пункт {0} не найден в списке"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr ""
-#~ "текущее значение параметра вне допустимой области: текущее значение {0}"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Достигнут конец линии"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Достигнут перекрёсток"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL API. Перенаправление на "
-#~ "страницу истории OSM примитива вероятно не выполнено. Базовый URL API: "
-#~ "''{0}''"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Отношения членства были скопированы на все новые линии. \n"
-#~ "Вы должны проверить и исправить, если это необходимо."
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Внимание: Удаление линии {0}, так как количество точек стало меньше 2. "
-#~ "Текущее значение {1}"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Устранить конфликты тега {0} в {1}{2}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "удаление ссылки из линии {0}"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Устранить конфликты в списке точек линии {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Устранить конфликты версии для {0}{1}"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Поднять выделенные элементы на одну позицию"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Опустить выделенные элементы на одну позицию"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Произошла ошибка во время соединения с сервером<br>Подробности: {0}"
-#~ "</html>"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "видим (на сервере)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Видим:"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Связь с сервером прервана"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Оставить моё состояние \"Видим\""
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "невидим (на сервере)"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Физически удалить из локального набора данных"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Сбросить в 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Оставить их состояние \"Видим\""
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Да, очистить"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Да, сбросить id"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Что бы оставить вашу локальную версию, JOSM<br>должен сбросить "
-#~ "значение id {0} {1} в 0.<br>Во время следующей загрузки на сервер, сервер "
-#~ "присвоит<br>новое значение id.<br>Вы согласны?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Удалить из набора данных"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Объединить в любом случае"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "Не могу принять неопределённое объединение тегов"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Применить частичное решение"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Вы не закончили устранение конфликтов.<br>Нажмите <strong>{0}</"
-#~ "strong> что бы в любом случае применить уже устранённые конфликты.<br>Вы "
-#~ "можете устранить оставшиеся конфликты позже.<br>Нажмите <strong>{1}</"
-#~ "strong> что бы вернуться к устранению конфликтов.</html>"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "История для {0}{1}"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Загрузка истории для {0} с id {1}"
-
-#~ msgid "History item"
-#~ msgstr "Пункт истории"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "Индекс вне допустимых пределов. Текущее значение {0}"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Загрузка истории с сервера потерпела неудачу. Подробности:<br>{0}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Скопировать их выделенные элементы перед первым выделенным элементом в "
-#~ "объединённом списке элементов"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Скопировать мои выделенные элементы после первого выделенного элемента в "
-#~ "объединённом списке элементов"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Скопировать их выделенные элементы в конец объединённого списка элементов"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Скопировать их выделенные элементы в начало объединённого списка элементов"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Нажмите <strong>{0}</strong> что бы закончить объединение моих и их "
-#~ "записей</html>"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr ""
-#~ "Отменить фиксирование объединённого списка элементов и начать объединение"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Нажмите <strong>{0}</strong> что бы начать объединение моих и их "
-#~ "записи</html>"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Зафиксировать текущий объединённый список элементов"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Удалить выделенные записи из объединённого списка элементов"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "параметр '{0}' не должен быть null"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Оставить клон локальной версии"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Версия <strong>{0}</strong> дата создания: <strong>{1}</strong> "
-#~ "автор: <strong>{2}</strong></html>"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Логин (e-mail) учётной записи OSM"
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr ""
-#~ "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа long, текущее "
-#~ "значение ''{1}''"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "обязательный атрибут ''{0}'' отсутствует"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\""
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Неверное значение атрибута \"version\" OSM примитива с id {0}, текущее "
-#~ "значение {1}"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Отсутствует атрибут \"type\" участника {0} в отношении {1}"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Отсутствует атрибут \"ref\" участника отношения {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr ""
-#~ "Неверное значение атрибута \"ref\" участника отношения {0}, текущее "
-#~ "значение {1}"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа int (>=0), текущее "
-#~ "значение ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
-#~ "значение ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа int, текущее "
-#~ "значение ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
-#~ "значение ''{1}''"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Не удалось установить соединение с API {0}"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>Плагин openstreetbus использует старый сервер appspot.com.<br>Новый "
-#~ "сервер доступен на schokokeks.org.<br>Хотите переключится на новый "
-#~ "сервер? (Строго рекомендуется)</html>"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "Импорт TangoGPS окончен ошибкой!"
-
-#~ msgid "image loading..."
-#~ msgstr "изображение загружается..."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Не могу сопоставить введённую ссылку или id с выделенным сервисом. "
-#~ "Пожалуйста попробуйте ещё раз."
-
-#~ msgid "No data"
-#~ msgstr "Нет данных"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Перемещено больше чем {0} элементов. Перемещение такого количество "
-#~ "элементов часто является ошибкой. Действительно переместить?"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Изменить {0} {1}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Повернуть {0} {1}"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "ГСК WGS84"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Зона {0}"
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Слой{0} должен быть в списке слоев"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Скопировать выделенные элементы в конец объединённого списка элементов"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Скопировать выделенные элементы перед первым выделенным элементом в "
-#~ "объединённом списке элементов"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Открыть изображения через AgPifoJ..."
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Добавить {0} {1}"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Удалить участника отношений {0} {1}"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Ошибка синтаксиса шаблона: Шаблон {0} в {1} недопустим!"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "параметр ''{0}'' не должен быть нулевым"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Конфликт в данных"
-
-#~ msgid "Conflict created"
-#~ msgstr "Конфликт создан"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Удалить выделенные теги"
-
-#~ msgid "Used style"
-#~ msgstr "Использованный стиль"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Добавить новый XML источник к списку."
-
-#~ msgid "Copy defaults"
-#~ msgstr "Копировать умолчания"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Сервер возвратил ошибку с кодом {0}"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Плагин {0} не доступен. Обновление пропущено."
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не "
-#~ "найдены."
-
-#~ msgid "image "
-#~ msgstr "изображение "
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Вы действительно хотите удалить слой ''{0}''?"
-
-#~ msgid "Confirmation"
-#~ msgstr "Подтверждение"
-
-#~ msgid "Delete all"
-#~ msgstr "Удалить всё"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr "<html>Невозможно прочесть файл: ''{0}''. Ошибка в: <br>{1}</html>"
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Внимание: невозможно разместить диалоговое окно поверх всех окон. "
-#~ "Исключение в: {0}"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "Выгрузить все изменения за один запрос"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ВНИМАНИЕ: Пароль хранится открытым текстом, в файле настроек."
-#~ "<br>Пароль передаётся на сервер открытым текстом, закодированный в URL."
-#~ "<br><b>Не используйте важные Пароли.</b></html"
-
-#~ msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-#~ msgstr "<html>Произошла ошибка при сохранении.<br>Ошибка: <br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Произошла ошибка при восстановлении резервной копии файла."
-#~ "<br>Ошибка: <br>{0}</html>"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Невозможно записать закладку.<br>{0}</html>"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Сначала выберите закладку"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Не удалось загрузить закладки с ''{0}'' в свези с проблемами "
-#~ "безопасности. Текст ошибки: {1}"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Присутствуют не сохранённые изменения на {0} слое. Отменить изменения и "
-#~ "продолжить?"
-#~ msgstr[1] ""
-#~ "Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и "
-#~ "продолжить?"
-#~ msgstr[2] ""
-#~ "Присутствуют не сохранённые изменения на {0} слоях. Отменить изменения и "
-#~ "продолжить?"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "В данный момент нет открытого пакета изменений"
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Закрыть текущий пакет изменений ..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Закрыть текущий пакет изменений"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr ""
-#~ "<html>Присутствуют неразрешённые конфликты на слое ''{0}''.<br>Необходимо "
-#~ "сначала разрешить их.<html>"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Использовать новый пакет изменений и закрыть его"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Использовать новый пакет изменений и оставить его открытым"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "Выберите, чтобы выгрузить данные в новый пакет изменений, и закрыть его "
-#~ "после загрузки."
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Выберите, чтобы выгрузить данные в новый пакет изменений, и оставить его "
-#~ "открытым после загрузки."
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "Выгрузить в новый или существующий пакет изменений?"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и оставить "
-#~ "его открытым после загрузки"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "Изменить {0} объект:"
-#~ msgstr[1] "Изменить {0} объекта:"
-#~ msgstr[2] "Изменить {0} объектов:"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть "
-#~ "его после загрузки"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Всегда перемещать и больше не показывать этого предупреждения"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Поиск невозможен, так как не загружено никаких данных."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Не удалось прочитать файл ''{0}''.<br> Ошибка: <br>{1}</html>"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr ""
-#~ "Использовать текущий набор изменений {0} и закрыть его после загрузки"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "Использовать текущий список изменений {0} и оставить открытым"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Невозможно открыть соединение с удаленным сервером<br>''{0}''<br>по "
-#~ "причинам безопасности. Скорее всего вы запустили<br>приложение без "
-#~ "загрузки формы приложения ''{1}''.</html>"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "примечание: Для некоторых задач JOSM требуется много опеативной памяти. "
-#~ "Возможно необходимо добавить следующие\n"
-#~ "      настройки Java для увеличения максимально размера используемой "
-#~ "памяти"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Диалог ещё не создан. Сначала используйте createInstance()"
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "параметр ''{0}'' не должен быть пустым"
-
-#~ msgid "expected id >= 0. Got {0}"
-#~ msgstr "обнаружен id >= 0. Получено {0}"
-
-#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
-#~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''"
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "Ключ ''{0}'' и все его значения будут удалены"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Необходимо выбрать значение для сохранения"
-
-#~ msgid "not yet decided"
-#~ msgstr "ещё не решено"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "набор тегов не содержит выделенное значение ''{0}''"
-
-#~ msgid "No, don't apply"
-#~ msgstr "Нет, не записывать"
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "параметр ''{0}'' не может быть нулём"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
-#~ "<br>Невозможно добавить данный конфликт.</html>"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Предупреждение: слой ''{0}'' больше не существует. Невозможно удалить "
-#~ "конфликт для элемента ''{1}''"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Чтобы спасти вашу локальную версию, JOSM<br>сбросит значение id "
-#~ "элемента {0} в 0.<br>При очередной загрузке на сервер,<br>id элемента "
-#~ "получит новое значение.<br>Вы согласны?</html>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>Загрузка <strong>не удалась</strong> потому что вы "
-#~ "используете<br>пакет изменений {0}, который был уже закрыт в {1}."
-#~ "<br>Пожалуйста, загрузите еще раз новый или существующий открытый пакет "
-#~ "изменений."
-
-#~ msgid "Cancel closeing of changesets"
-#~ msgstr "Отменить закрытие пакетов изменений"
-
-#~ msgid "current changeset is null. Can't upload data."
-#~ msgstr "текущий набор изменений пуст. Невозможно загрузить данные."
-
-#~ msgid "id of current changeset > required. Current id is {0}"
-#~ msgstr ""
-#~ "требуется идентификатор текущего пакета изменений > 0. Текущий "
-#~ "идентификатор {0}"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Пожалуйста, введите строку фильтра"
-
-#~ msgid "Text"
-#~ msgstr "Текст"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "В отношении имеется пустой участник."
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "удаление ссылки из отношения {0}"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "В отношении «{0}» имеется участник, который был удален."
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>Имеется по крайней мере один участник отношения, обращающийся <br>в "
-#~ "отношении сам к себе.<br>Это создает циклические зависимости и "
-#~ "обескураживает.<br>Вы хотите продолжить с циклическими зависимостями?</"
-#~ "html>"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\">английском</"
-#~ "A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\"> английском "
-#~ "</A> или <A HREF=\"{1}\">вашем языке</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её в<A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её в <A HREF=\"{0}\">English</A> "
-#~ "или <A HREF=\"{1}\">вашем языке</A>."
-
-#~ msgid "Found XML element <member> not as direct child of element <relation>"
-#~ msgstr ""
-#~ "Найденный участник XML <member> не прямой потомок отношения <relation>"
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Ошиочный заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}\""
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Предупреждение: ошибочный заголовок \"{0}\" не соответствует ожидаемой "
-#~ "структуре \"{1}\""
-
-#~ msgid "child.getId() >0 expected. Got {1}"
-#~ msgstr "Ожидолось child.getId() >0. Получено {1}"
-
-#~ msgid "id > 0 expected, got {0}"
-#~ msgstr "ожидалось id > 0, получено {0}"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "неожиданный индекс столбца. Получено {0}"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "параметр ''{0}'' должен быть > 0, получено значение ''{1}''"
-
-#~ msgid "version > 0 expected. Got {0}"
-#~ msgstr "ожидалась версия > 0. Получено {0}"
-
-#~ msgid "id > 0 expected. Got {0}"
-#~ msgstr "ожидалось id > 0. Получено {0}"
-
-#~ msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-#~ msgstr ""
-#~ "ожидался параметр ''{0}'' с тегами только для одного ключа. Получено {1}"
-
-#~ msgid "changeset id > 0 expected. Got {1}"
-#~ msgstr "ожидался id пакета изменений > 0. Получено {1}"
-
-#~ msgid "Changeset id > 0 expected. Got {0}"
-#~ msgstr "Ожидался id пакета изменений > 0. Получено {0}"
-
-#~ msgid "Open changeset expected. Got closed changeset with id {0}"
-#~ msgstr ""
-#~ "Ожижался открытый пакет изменений. Получен закрытый пакет изменений с id "
-#~ "{0}"
-
-#~ msgid "parameter ''{0}'' > 0 expected. Got {1}"
-#~ msgstr "ожидался параметр ''{0}'' > 0. Получено {1}"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Ожидался экземпляр OsmDataLayer. Получено ''{0}''."
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: запуск окон браузера только для первых {0} из {1} "
-#~ "выделенных элементов"
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Загрузка родителей элемента {2}"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Не найден элемент с id {0} в текущем наборе данных"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Объедините выбранные элементы в другой слой"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "для элемента {0}"
-#~ msgstr[1] "для элементов {0}"
-#~ msgstr[2] "для элементов {0}"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: неожиданный формат адреса базы API. Перенаправление на "
-#~ "страницу информации или истории изменений элементов OSM невозможно. Адрес "
-#~ "базы API: ''{0}''"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Обновление элемента"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Восстановить {0} удаленных элементов"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Очистка 1 элемента"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Удалённые или перемещённые элементы"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Кол-во элементов в вашем наборе данных: {0} <br>Они могут быть "
-#~ "удалены на сервере. В дальнейшем, если вы попытаетесь удалить "
-#~ "или<br>обновить их, сервер скорее всего сообщит о<br>конфликте."
-#~ "<br><br>Нажмите <strong>{1}</strong> что бы проверить состояние этих "
-#~ "элементов<br>на сервере.<br>Нажмите <strong>{2}</strong> чтобы "
-#~ "проигнорировать.<br></html>"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "конфликт уже зарегистрирован для элемента''{0}''"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Существуют дополнительные элементы ( {0} шт.), связанные с "
-#~ "отношением {1}<br>, которые удалены с сервера. <br><br>Вы хотите "
-#~ "восстановить их тоже?</html>"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr "невозможно сравнить элемент с id ''{0}'' и элемент с id ''{1}''"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Элемент с id {0} и версией {1} не был найден в этом наборе данных"
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "элемент с id=0 не может быть невидимым"
-
-#~ msgid ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-#~ msgstr ""
-#~ "набор тэгов не может быть применен к элементу из-за наличия ключей с "
-#~ "несколькими значениями"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Восстановить связанные элементы?"
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Элемент с id {0} не был найден в этом наборе данных"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Элемент уже удален"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "В этой истории не существует элемента версии {0}"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Мой элемент с id {0} и версией {1} видимый, хотя чужой элемент с более "
-#~ "низкой версией {2} невидим. Невозможно справиться с этой "
-#~ "несовместимостью. Сохраняю мой элемент. "
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Выбрать элементы, созданные этим пользователем"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Показать историю выделенного элемента"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Вы назначили пустую роль на {0} элем .<br>Это эквивалентно удалению "
-#~ "ролей из этих элементов.<br>Вы действительно хотите назначить новую роль?"
-#~ "</html>"
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "история ещё не инициализирована. Не удалось установить элемент по ссылке."
-
-#~ msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-#~ msgstr "Отсутствует атрибут ''version'' на элементе OSM с id {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got "
-#~ "{1}"
-#~ msgstr ""
-#~ "неверное значение для атрибута ''version'' на элементе OSM с id {0}. "
-#~ "Получено {1}"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr ""
-#~ "история еще не инициализирована. Не удалось настроить текущий элемент."
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
-#~ "получено ''{1}''"
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "неожиданный формат новой версии изменённого элемента \"{0}\", получено "
-#~ "\"{1}\""
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "нет элемента с id {0} в локальном наборе данных. Невозможно вывести тип "
-#~ "элемента"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Сервер выдал ошибку 404, повторная попытка индивидуальными запросам для "
-#~ "каждого элемента"
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''"
-#~ msgstr ""
-#~ "Отношение с внешним id ''{0}'' ссылается на отсутствующий элемент с "
-#~ "внешним id ''{1}''"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Конфликт во время скачивания"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Скачать зависимости с OSM..."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Выберите хотя бы один тип данных для скачивания."
-
-#~ msgid "Download referrers..."
-#~ msgstr "Скачать зависимости..."
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr ""
-#~ "Во время скачивания большого массива данных обнаружены следующие ошибки:"
-#~ "{0}"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Вы собираетесь удалить точки, находящиеся за пределами скачиваемой зоны."
-#~ "<br>Это может вызвать проблемы, потому что другие объекты (которых не "
-#~ "видно) могут использовать их.<br> Вы действительно хотите удалить эти "
-#~ "точки?"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Ошибка во время скачивания"
-
-#~ msgid "Downloading..."
-#~ msgstr "Скачивание..."
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Скачать квадрат карты WMS из {0}"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Ошибка загрузки в OSM API"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Загрузка на сервер <strong>не удалась</strong>.<br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} отношения создали цикл, так как они ссылаются друг на друга."
-#~ "<br>JOSM не может загрузить их на сервер. Пожалуйста, отредактируйте "
-#~ "отношения, удалив циклические ссылки.</html>"
-
-#~ msgid ""
-#~ "<html>An upload and/or save operation of one layer with "
-#~ "modifications<br>was cancelled or has been failed.</html>"
-#~ msgstr ""
-#~ "<html>Операция загрузки на сервер или сохранения одного изменённого "
-#~ "слоя<br>была отменена или не удалась.</html>"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "неверный комментарий загрузки на сервер"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Включите, чтобы загрузить на сервер все изменения за один запрос или "
-#~ "отключите, чтобы делать отдельный запрос для каждого изменённого элемента"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Загрузить все изменения на сервер одним запросом"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Нет пакетов изменений для загрузки на сервер внесённых изменений"
-
-#~ msgid "Uploading..."
-#~ msgstr "Загрузка на сервер..."
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Подготовка элементов к загрузке на сервер ..."
-
-#~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to "
-#~ "version 0.6"
-#~ msgstr ""
-#~ "Предупреждение: нет версии API предназначенной для загрузки данных на "
-#~ "сервер. Возврат к версии 0.6"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Загрузка на сервер <strong>не удалась</strong>, потому что элемент, "
-#~ "который вы пытались удалить <br>уже удален с сервера.<br><br>Сообщение об "
-#~ "ошибке:<br>{0}</html>"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "Предупреждение: параметр ''{0}'' или api версия ''{1}'' набора данных "
-#~ "требует использовать загрузку изменений на сервер, но API не может "
-#~ "выполнить это. Загрузка изменений на сервер не будет выполнена."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Данные содержат ошибки. Всё равно загрузить на сервер?"
-
-#~ msgid "found XML element <nd> element not as direct child of element <way>"
-#~ msgstr "найденная точка XML <nd> не является прямым наследником линии <way>"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "невозможно добавить точку {0} к незавершённой линии {1}"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Выделите начальную точку на конце линии"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Существует {0} дополнительных точек используемых треком {1} <br>, "
-#~ "которые удалены на сервере. <br><br> Вы хотите восстановить эти точки "
-#~ "тоже?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Восстановить дополнительные точки?"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Непомеченные тегами и не соединённые точки"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Скачать недостающие части линий и точки, участвующие в отношении"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Не найдена линия \"до\""
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Внутренняя линия «{0}» находится снаружи."
-
-#~ 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] "Выделена {0} линия. Вы уверены, что хотите упростить её?"
-#~ msgstr[1] "Выделено {0} линии. Вы уверены, что хотите упростить их все?"
-#~ msgstr[2] "Выделено {0} линий. Вы уверены, что хотите упростить их все?"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Стиль для внешней линии ''{0}'' отсутствует."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Можно только две точки"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Пожалуйста, выберите одну или несолько замкнутых линий, состоящих, как "
-#~ "минимум, из четырех точек."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr ""
-#~ "Ни одна из этих точек, находящихся на линиях, ни к чему не прикреплена."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Щёлкните для удаления. Shift: удалить сегмент. Alt: не удалять "
-#~ "неиспользуемые точки при удалении линии. Ctrl: удалить соответствующие "
-#~ "объекты."
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>точки:</b>... - объект с заданным количеством точек"
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Неверное значение оператора точек: {0}. Оператор точек ожидает число "
-#~ "точек или диапазон, например, точки:10-20"
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Конфликт при слиянии точек - объединённая точка ''{0}''"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "объединённые узлы ещё не заморожены. Невозможно построить команду разборки"
-
-#~ msgid ""
-#~ "way with external id ''{0}'' includes missing node with external id "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "линия с внешним id ''{0}'' содержит отсутствующую точку с внешним id "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too"
-#~ msgstr ""
-#~ "отмеченная линия {0} с {1} точками неполная, потому что, по крайней мере, "
-#~ "одна точка отсутствовала в загруженных данных"
-
-#~ msgid "{0} extrem nodes."
-#~ msgstr "{0} экстремальных точек."
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Выберите одну замкнутую линию, содержащую, не менее четырёх точек."
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Этот тест проверяет - есть ли линии с одними и теми же тегами и "
-#~ "одинаковыми координатами точек."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Имеются неустранённые конфликты в слое''{0}''.<br>Вам надо их "
-#~ "устранить.</html>"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Устранить конфликты версий для точки {0}"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "невозможно устранить конфликт"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Устранить конфликты версий для отношения {0}"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Устранить конфликты версий для линии {0}"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} неустранённых конфликтов тегов"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''"
-#~ msgstr ""
-#~ "Предупреждение: слой ''{0}'' больше не существует. Невозможно удалить "
-#~ "конфликт для элемента ''{1}''"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "параметр {0} должен быть > 0. Получен {1}."
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "id пакета изменений должен быть > 0. Получен {0}"
-
-#~ msgid "parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "параметр ''{0}'' должен быть > 0. Получен {1}"
-
-#~ msgid "id parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "id параметра ''{0}'' должен быть > 0. Получен {1}"
-
-#~ msgid "id of current changeset > 0 required. Current id is {0}"
-#~ msgstr "id текущего пакета изменений должен быть > 0. Текущий id: {0}"
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен."
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Должны быть выделены только линии."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Линия «{0}» имеет меньше двух точек."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Линия, обозначающая границу области, не замкнута."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Обнаружено больше одной линии \"до\""
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Нет полезной роли ''{0}'' для пути ''{1}''."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Персечение между линиями ''{0}'' и ''{1}''."
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "ВАЖНО : данные расположены слишком\n"
-#~ "далеко от текущих границ Lambert зоны.\n"
-#~ "Не загружайте пока никаких данных .\n"
-#~ "Отмените последнее действие, сохраните\n"
-#~ "данные и начните новый слой в новой зоне."
-
-#~ msgid "A"
-#~ msgstr "Д"
-
-#~ msgid "H"
-#~ msgstr "С"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid "R"
-#~ msgstr "З"
-
-#~ msgid "D"
-#~ msgstr "У"
-
-#~ msgid "F"
-#~ msgstr "В"
-
-#~ msgid "C"
-#~ msgstr "М"
-
-#~ msgid "I"
-#~ msgstr "И"
-
-#~ msgid "M"
-#~ msgstr "Р"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "brown"
-#~ msgstr "коричневый"
-
-#~ msgid "red"
-#~ msgstr "красный"
-
-#~ msgid "black"
-#~ msgstr "чёрный"
-
-#~ msgid "white"
-#~ msgstr "белый"
-
-#~ msgid "blue"
-#~ msgstr "синий"
-
-#~ msgid "Man-Made"
-#~ msgstr "Рукотворное"
-
-#~ msgid "Bikes"
-#~ msgstr "Велосипеды"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Скопировать выделенное по умолчанию"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "параметр ''{0}'' не должен быть null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "неожиданное возвращённое значение. Получено {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "обнаружен id >= 0. Получено {0}"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "более ранняя версия не найдена. История пуста."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "более поздняя версия не найдена. История пуста."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr ""
-#~ "текущее значение параметра вне допустимой области: текущее значение {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "параметр ''{0}'' не должен быть пустым"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "набор тегов не содержит выделенное значение ''{0}''"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "Индекс вне допустимых пределов. Текущее значение {0}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Невозможно прочитать \"{0}\""
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr ""
-#~ "отсутствует пункт настройки \"{0}\". Не могу инициализировать OsmApi"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа int, текущее "
-#~ "значение ''{1}''"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "неверное значение обязательного атрибута ''{0}'' типа int (>=0), текущее "
-#~ "значение ''{1}''"
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Не удается соединиться с сервером OSM. Пожалуйста, проверьте Ваше "
-#~ "интернет-соединение."
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "Набор тегов не может быть применен к элементу из-за наличия ключей с "
-#~ "несколькими значениями."
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "Элемент с id=0 не может быть невидимым"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Предупреждение: автоматическое усечение значения тега ''{0}'' на "
-#~ "удалённом элементе {1}"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Длина значения для тега \"{0}'' элемента {1} превышает максимально "
-#~ "допустимую длину {2}. Значение длины {3}."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "Невозможно сравнить элемент с id ''{0}'' и элемент с id ''{1}''"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM удалит ваш локальный элемент с id {0}<br>из набора данных."
-#~ "<br>Вы согласны?</html>"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Показать историю выделенного элемента"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "В этой истории не существует элемента версии {0}"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Сервер выдал ошибку 404, повторная попытка будет с индивидуальным "
-#~ "запросом для каждого элемента"
-
-#~ msgid "Linked"
-#~ msgstr "Связанные"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Предупреждение: Слой ''{0}'' больше не существует. Невозможно удалить "
-#~ "конфликт для элемента ''{1}''."
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Основной URL-адрес<br>''{0}''<br>для этого слоя WMS не оканчивается "
-#~ "ни на ''&'' ни на ''?''.<br>Это может привести к неверному запросу WMS. "
-#~ "Необходимо проверить ваши<br>настройки параметров.<br>Вы всё равно хотите "
-#~ "попытаться извлечь квадраты WMS?"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Дублирует линии с помощью смещения"
-
-#~ msgid "Bridleway"
-#~ msgstr "Дорога для верховой езды"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Не отображать стрелки, если они находятся близко от предыдущих стрелок"
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "Отмеченная линия {0} с точками в кол-ве: {1} неполная, потому что по "
-#~ "крайней мере одна точка отсутствовала в скачанных данных."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Дублировать линию"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Невозможно дублировать неупорядоченную линию."
-
-#~ msgid "MIddle way: {0}"
-#~ msgstr "Середина линии: {0}"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Модуль {0} требует обновить JOSM до версии {1}."
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} модуль успешно скачен. Пожалуйста, перезагрузите JOSM."
-#~ msgstr[1] "{0} модуля успешно скачено. Пожалуйста, перезагрузите JOSM."
-#~ msgstr[2] "{0} модулей успешно скачено. Пожалуйста, перезагрузите JOSM."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Модуль не найден: {0}."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Скачать недостающие модули"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Информации о модулях не найдена."
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Не удается удалить модуль. Возможно он уже выключен"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Можно добавлять, редактировать и удалять сервисы WMS на вкладке "
-#~ "\"Параметры модуля WMS\" - они будут отображены в меню WMS.\n"
-#~ "\n"
-#~ "Также можно сделать это вручную в \"Расширенных настройках\", используя "
-#~ "следующую схему:\n"
-#~ "wmsplugin.url.1.name=Landsat\n"
-#~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-#~ "wmsplugin.url.2.name=NPE Maps... и так далее\n"
-#~ "\n"
-#~ "Пример входного формата: полный URL WMS (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Для Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) , "
-#~ "всё что нужно - ввести соответствующий 'id'.\n"
-#~ "Чтобы добавить пункт меню \"Metacarta Map Rectifier\", создайте URL как в "
-#~ "приведённом примере, заменив 73 на 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"
-#~ "Примечание: Убедитесь что использование изображения легально, если в этом "
-#~ "есть хоть какие-то сомнения - не используйте его."
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Настройки модуля SlippyMap."
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Показать статус квадрата карты"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Источник квадратов карты"
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Автозагружаемые квадраты карты: "
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Неожиданный индекс столбца. Получено {0}."
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "Ожидался параметр ''{0}'' с тегами для определённого ключа. Получено {1}."
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>Не удаётся создать ссылку URL, потому что кодировка "
-#~ "''{0}''<br>отсутствует в этой системе.</html>"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr ""
-#~ "Предупреждение: исключение проигнорировано, потому что задача отмнена. "
-#~ "Исключение было: "
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>Это отношение было изменено за пределами редактора.<br>Невозможно "
-#~ "применить ваши изменения и продолжить редактирование.<br><br>Вы хотите "
-#~ "создать конфликт и закрыть редактор?</html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Масштабировать:</b> Крутите колёсико мыши, сделайте двойной щелчок или "
-#~ "нажмите Ctrl + Вверх/Вниз <b>Двигать карту:</b> Удерживая правую кнопку "
-#~ "мышки, двигайте мышку или используйте клавиши передвижения курсора. "
-#~ "<b>Выбрать:</b> Удерживая левую кнопку мышки, нарисуйте рамку."
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} слой, необходимо сохранить в соответствующий файл,<br> но это "
-#~ "не удаётся сделать.<br>Либо выберите другой файл для этого слоя, либо "
-#~ "отмените изменения.<br>Слой, который не удаётся записать в файл:</html>"
-#~ msgstr[1] ""
-#~ "<html>{0} слоя, необходимо сохранить в соответствующие файлы,<br> но это "
-#~ "не удаётся сделать.<br>выберите другие файлы для каждого из этих слоёв, "
-#~ "либо отмените изменения.<br>Слои, которые не удаётся записать в файлы:</"
-#~ "html>"
-#~ msgstr[2] ""
-#~ "<html>{0} слоёв, необходимо сохранить в соответствующий файл,<br> но это "
-#~ "не удаётся сделать.<br>выберите другие файлы для каждого из этих слоёв, "
-#~ "либо отмените изменения.<br>Слои, которые не удаётся записать в файл:</"
-#~ "html>"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Сохранить и Удалить"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "трек"
-#~ msgstr[1] "треки"
-#~ msgstr[2] "треков"
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "Нет элемента с id {0} в локальном наборе данных. Невозможно вывести тип "
-#~ "элемента."
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr ""
-#~ "Ошибка: не удалось добавить учётные данные проверки подлинности к "
-#~ "соединению."
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''."
-#~ msgstr ""
-#~ "Отношение с внешним id ''{0}'' обращается к отсутствующему элементу с "
-#~ "внешним id ''{1}''."
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr ""
-#~ "Неизвестный тип участника отношения ''{0}'' в отношении с внешним id "
-#~ "''{1}''."
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr "Неверное числовое значение для атрибута ''{0}''. Получено ''{1}''."
+#~ "Модуль cadastre-fr использует для захвата клавишу F11,\n"
+#~ "которая по обычно включает полноэкранный режим.\n"
+#~ "Вы хотите назначить на клавишу F11 функцию захвата?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "необычная комбинация тегов"
 
 #~ msgid ""
 #~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Отсутствует обязательный элемент атрибута ''bounds''. Получено "
-#~ "minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', "
+#~ "Отсутствуют обязательные атрибуты элемента ''bounds'' (границы). Получено "
+#~ "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', "
 #~ "origin=''{5}''."
 
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
 #~ msgid ""
-#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "ПРЕДУПРЕЖДЕНИЕ: параметр ''{0}'' или версия API ''{1}'' набора данных "
-#~ "требует загрузку на сервер изменений, но API не способна выполнить это. "
-#~ "Загрузка изменений на сервер будет проигнорирована."
+#~ "Предупреждение: неожиданный номер версии JOSM в файле исправлений, "
+#~ "значение: ''{0}''"
 
 #~ msgid ""
-#~ "Preference with key ''{0}'' does not include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Параметр с ключом ''{0}'' не содержит ''{1}''. Невозможно восстановить "
-#~ "геометрию окна из параметров."
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "Заменить линию этим участником, связанным с объединённой линией"
+#~ "Предупреждение: не удалось открыть входящий поток для ресурса ''/data/"
+#~ "{0}''. Невозможно загрузить решётку NTF<->RGF93"
+
+#~ msgid "Changeset"
+#~ msgstr "Пакет правок"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr ""
+#~ "Шапка документа OsmChange ещё не записана. Пожалуйста, сначала запишите "
+#~ "её."
 
 #~ msgid ""
-#~ "Preference with key ''{0}'' does not provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Параметр с ключом ''{0}'' не содержит значение int value для ''{1}''. "
-#~ "Получено {2}. Невозможно восстановить геометрию окна с помощью параметров."
+#~ "Произошла ошибка при разборе файла gpx {0}. Доступна только часть файла"
 
 #~ msgid ""
-#~ "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Ошибка при анализе области ''{1}'' в параметрах с ключом ''{0}''. "
-#~ "Исключение было: {2}. Невозможно восстановить геометрию окна с помощью "
-#~ "параметров."
+#~ "<html>Необходимо <strong>несколько пакетов правок</strong>, чтобы "
+#~ "передать на сервер {0} объектов. Какую стратегию вы выберете?</html>"
 
 #~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Предупреждение: Не удалось восстановить геометрию окна из ключа ''{0}''. "
-#~ "Геометрия приведена к состоянию по умолчанию. Детали: {1}"
-
-#~ msgid "Processing {0}"
-#~ msgstr "Обработка {0}"
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "ошибка запроса обновления: уровень масштабирования не 12"
-
-#~ msgid "create new objects"
-#~ msgstr "создать новые объекты"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Выбрать слой WMS"
+#~ "Предупреждение: Ошибка инициализации настроек. Не удалось сбросить файл "
+#~ "настроек {0} к состоянию по умолчанию."
 
 #~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Предупреждение: Основная ссылка ''{0}'' для сервиса WMS не оканчивается "
-#~ "на знак '&' или '?'."
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr ""
-#~ "Значения по умолчанию (Смотрите подсказки, чтобы узнать больше об этом)"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Нет слоя WMS для выравнивания."
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Пожалуйста, выберите слой WMS для выравнивания"
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr ""
-#~ "Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} "
-#~ "шт.."
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Задать группу ''{0}'' в группе ''{1}''"
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr ""
-#~ "Сгруппировать ввод простой интерполяции адресов в единственный диалог,"
+#~ "Заменить оригинальный белый фон на цвет фона, заданный в настройках JOSM."
 
 #~ msgid ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Вы не закончили слияние изменений в этом конфликте.<br>Улаживание "
-#~ "конфликтов не может быть применено до тех пор, пока все все конфликты не "
-#~ "будут улажены.<br>Нажатие на <strong>'{0}'</strong>, закроет диалог. "
-#~ "<strong> Однако<br> неулаженные конфликты при этом не будут применены.</"
-#~ "strong><br>Если же нажать на <strong>{1}</strong>, то вы вернётесь к "
-#~ "улаживанию конфликтов.</html>"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Изображения с геотегами"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Показать изображения с геотегами"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} изображений имело теги GPS"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Ошибка! Возможно отсутствуют теги."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "область с вложениями ''{0}'' не замкнута"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Для области с вложениями «{0}» отсутствует внешняя линия."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "не-линия ''{0}'' области с вложениями"
-
-#~ msgid "Relation: from {0} to {1} via {2}"
-#~ msgstr "Отношение: from (от) {0} to (до) {1} via (через) {2}"
-
-#~ msgid "Via node {0}, {1}"
-#~ msgstr "Точка \"via\" (через) {0}, {1}"
-
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} точки \"via\" (через)."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr ""
-#~ "Линия \"from\" (от) не начинается и не заканчивается на линии \"via"
-#~ "\" (через)."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "Линия \"to\" (до) не начинается и не заканчивается на точке \"via"
-#~ "\" (через)."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Не найдена точка или линия \"via\" (через)."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Найдено больше одного \"via\" (через)."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr ""
-#~ "Линия \"from\" (от) не начинается или заканчивается на точке \"via"
-#~ "\" (через)."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr ""
-#~ "Линия \"to\" (до) не начинается и не заканчивается на линии \"via"
-#~ "\" (через)."
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Очищеный объект ''{0}''"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка "
-#~ "на сервер будет произведена без этого элемента."
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Удаление ссылки из отношения {0}"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Очищено объектов: {0}"
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} объект был очищен в локальном наборе данных, потому что он удалён на "
-#~ "сервере."
-#~ msgstr[1] ""
-#~ "{0} объекта было очищено в локальном наборе данных, потому что они "
-#~ "удалены на сервере."
-#~ msgstr[2] ""
-#~ "{0} объектов было очищено в локальном наборе данных, потому что они "
-#~ "удалены на сервере."
-
-#~ msgid "tower"
-#~ msgstr "вышка"
-
-#~ msgid "any substance"
-#~ msgstr "любого назначения"
-
-#~ msgid "overground"
-#~ msgstr "надземная"
-
-#~ msgid "underwater"
-#~ msgstr "подводная"
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
-#~ "update, or delete. Either the respective object<br>doesn''t exist on the "
-#~ "server or you''re using an invalid URL to access<br>it. Please carefully "
-#~ "check the servers address ''{1}'' for typos."
-#~ msgstr ""
-#~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
-#~ "update, or delete. Either the respective object<br>doesn''t exist on the "
-#~ "server or you''re using an invalid URL to access<br>it. Please carefully "
-#~ "check the servers address ''{1}'' for typos."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Удалить выделенный слой."
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\"."
-#~ "<br>Удалить из отношения?</html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли "
-#~ "{2}.<br>Удалить из отношения?</html>"
-
-#~ 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 ""
-#~ "Выделенные линии содержат точки, находящиеся за пределами\n"
-#~ "скачанной области. Некоторые точки могут быть случайно\n"
-#~ "удалены. Вы действительно хотите продолжить?"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Не выделены элементы для обновления."
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Обновить выделенные элементы с сервера"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Переместите объект путём перетаскивания; Нажмите Shift для добавления к "
-#~ "выделенному (Ctrl для удаления); Shift-Ctrl для вращения выделенного; или "
-#~ "выделите что-либо другое"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "Ничего не найдено для выделенного ''{0}''"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Исправить выделенные ошибки."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Игнорировать выделенные ошибки в будущем."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Надено {0} совпадений из {1} в GPX треке {2}"
-
-#~ msgid "help"
-#~ msgstr "Справка"
-
-#~ msgid "Optional"
-#~ msgstr "Необязательно"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "Имя пользователя OSM (E-mail)"
-
-#~ msgid "Login"
-#~ msgstr "Войти"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Имя пользователя прокси-сервера"
-
-#~ msgid "Tag modified relations with   "
-#~ msgstr "Метка изменённых отношений с   "
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Скачать элементы, ссылающиеся на один из выделенных элементов"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Список модулей загружен с {0} сайта"
-#~ msgstr[1] "Список модулей загружен с {0} сайтов"
-#~ msgstr[2] "Список модулей загружен с {0} сайтов"
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Регулируемый {0} ещё не зарегистрирован. Невозможно установить участие в "
-#~ "синхронизированных регулировках."
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Несколько участников, относящихся к одному и тому же элементу"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>В этом отношение уже есть один или более участник, относящихся "
-#~ "к<br>элементу ''{0}''<br><br>Вы действительно хотите добавить другого "
-#~ "участника отношения?</html>"
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Неизвестный тип участника для «{0}»."
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr ""
-#~ "Выделить участников отношения, которые относятся к выбранным элементам"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Выделить участников отношения, которые относятся к {0} элем. среди "
-#~ "выделенных элементов"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Удалить всех участников, относящихся к каждому из выделенных элементов"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Выделить элементы для выделенных участников отношения"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Добавить все элементы, выделенные в текущем наборе данных, перед первым "
-#~ "выделенным участником"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Добавить все элементы, выделенные в текущем наборе данных, после "
-#~ "последнего выделенного участника"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Добавить все элементы, выделенные в текущем наборе данных, перед первым "
-#~ "участником"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Добавить все элементы, выделенные в текущем наборе данных, после "
-#~ "последнего участника"
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "Тип не найден. История пуста."
-
-#~ msgid "longitude"
-#~ msgstr "долгота"
-
-#~ msgid "Coordinate"
-#~ msgstr "Координата"
-
-#~ msgid "latitude"
-#~ msgstr "широта"
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn''t know about an object<br>you tried to "
-#~ "read, update, or delete. Either the respective object<br>doesn''t exist "
-#~ "on the server or you''re using an invalid URL to access<br>it. Please "
-#~ "carefully check the servers address ''{0}'' for typos."
-#~ msgstr ""
-#~ "Сервер OSM ''{0}'' не знает об объекте,<br>который вы пытались прочитать, "
-#~ "обновить или удалить. Либо соответствующий объект<br>не существует на "
-#~ "сервере, либо вы используете неправильную URL-ссылку для<br>доступа к "
-#~ "нему. Пожалуйста, внимательно проверьте адрес сервера ''{0}'' на предмет "
-#~ "опечаток."
-
-#~ msgid "Edit Airport"
-#~ msgstr "Править Аэродром"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html>Версия <strong>{0}</strong> была создана в <strong>{1}</strong> "
-#~ "автором <strong>{2}</strong> в пакете правок <strong>{3}</strong></html>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Загрузка на сервер <strong>не удалась</strong> потому что вы "
-#~ "используете<br>пакет правок {0}, который уже был закрыт в {1}."
-#~ "<br>Пожалуйста, загрузите снова, используя новый или существующий "
-#~ "открытый пакет правок.</html>"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок "
-#~ "(мин. 3 символа)"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Загрузить данные на сервер в уже открытый пакет правок"
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Открыть новый пакет правок"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Использовать открытый пакет правок"
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Невозможно закрыть пакет правок ''{0}'' на сервере OSM ''{1}''."
-#~ "<br>Пакет правок будет автоматически закрыт сервером по истечении времени "
-#~ "ожидания.</html>"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Текущий пакет правок пуст. Невозможно загрузить данные."
-
-#~ msgid "Update selections"
-#~ msgstr "Обновить выделенное"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Обновляет объекты с сервера, в текущем слое данных ."
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr "Загрузить на сервер OSM все изменения в выбранных данных."
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Загрузить на сервер OSM все изменения в текущем слое данных"
-
-#~ msgid ""
-#~ "Please consult the Conflict List Dialog<br>and manually resolve them."
-#~ msgstr ""
-#~ "Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
-#~ "конфликты вручную."
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "У вас, похоже, открыто {0} окон браузера.<br>Это перегружает ваш экран "
-#~ "окнами<br>и приводит к замедлению работы."
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Вы делите данные, которые должны быть скачаны в новый слой"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
-
-#~ msgid ""
-#~ "Plugin {0} version {1} found but for this version of JOSM is at least "
-#~ "version {2} required. Please update the plugin."
-#~ msgstr ""
-#~ "Найден модуль {0} версии {1} но для этой версии JOSM требуется, модуль по "
-#~ "крайней мере версии {2}. Пожалуйста, обновите модуль."
-
-#~ msgid "Failed to launch the external help browser"
-#~ msgstr "Не удалось запустить внешний браузер справки"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Ожидался объект с id > 0 . Получено {0}"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Мультиполигон должен состоять только из замкнутых линий."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Вы должны выделить, как минимум, две линии."
-
-#~ msgid ""
-#~ "<html>The server reported that it has detected a conflict.<br>Error "
-#~ "message (untranslated):<br>{0}"
-#~ msgstr ""
-#~ "<html>Сервер сообщил, что обнаружен конфликт.<br>Сообщение об ошибке (не "
-#~ "переведено):<br>{0}"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Создать мультиполигон за один щелчок гораздо проще, чем создать с помощью "
-#~ "редактора отношений."
-
-#~ msgid "Failed to read command. Exiting help browser. Exception was:"
-#~ msgstr ""
-#~ "Невозможно прочитать команду. Выход из браузера справки. Исключение было:"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Этот тест обнаружил многоязыковые объекты, у которых атрибут 'name' не "
-#~ "эквивалентен ни какому атрибуту 'name:*' и не входит в состав атрибутов "
-#~ "'name:*' , так, например: Italia - Italien - Italy."
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Объект с id {0} не найден в текущем наборе данных"
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>Была запрошена загрузка модуля {0}.<br>Этот модуль больше не "
-#~ "разрабатывается и, весьма вероятно, будет выдавать ошибки.<br>Он должен "
-#~ "быть отключён.<br>Удалить из настроек?</html>"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Требуется id > 0, получено {0}"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Добавлено {0} объектов"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information.You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Отсутствует содержимое справки в "
-#~ "справочном разделе</p><p class=\"warning-body\">Содержимое справки в "
-#~ "справочном разделе <strong>{0}</strong> пока ещё не доступно. Он ешё не "
-#~ "написан ни на русском ({1}), ни на английском языке.<br><br>Пожалуйста, "
-#~ "помогите улучшить справочную систему JOSM и допишите недостающую "
-#~ "информацию. Вы можете отредактировать статью <a href=\"{2}\">help на "
-#~ "русском ({1})</a> и статью <a href=\"{3}\">help на английском языке</a>.</"
-#~ "p></html>"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr ""
-#~ "Щёлкните, чтобы вернуться в редактор отношений и продолжить "
-#~ "редактирование отношения"
-
-#~ msgid "Warning: bad location in HTML document. Exception was: "
-#~ msgstr ""
-#~ "Предупреждение: плохое расположение в документе HTML. Исключение было: "
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Не удалось открыть справочную страницу по ссылке {0}.<br>Возможно в "
-#~ "сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
-
-#~ msgid "Set manually the Lambert zone"
-#~ msgstr "Задать вручную Lambert zone"
-
-#~ msgid ""
-#~ "Current layer is in Lambert CC9 Zone \"{0}\"\n"
-#~ "where the commune is in Lambert CC9 Zone \"{1}\".\n"
-#~ "Upload your changes, close all layers and change\n"
-#~ "manually the Lambert zone from the Cadastre menu"
-#~ msgstr ""
-#~ "Текущий слой в Lambert CC9 Zone это \"{0}\"\n"
-#~ "где коммуна в Lambert CC9 Zone это \"{1}\".\n"
-#~ "Загрузите на сервер изменения, закройте все слои\n"
-#~ "и измените вручную Lambert zone в меню Кадастр"
-
-#~ msgid "gray"
-#~ msgstr "серый"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Объединённые точки ещё не заблокированы. Невозможно построить команду "
-#~ "устранения конфликтов."
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "Объединённые точки ещё не заблокированы. Невозможно построить команду "
-#~ "устранения конфликтов"
-
-#~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the target node or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the target node will "
-#~ "take the place of the original node in the membership.</html>"
-#~ msgstr ""
-#~ "<html>Объединённые точки являются членами одного или более отношений. "
-#~ "Пожалуйста решите, хотите ли вы  <strong>сохранить</strong> этих "
-#~ "участников для полученной точки или вы хотите <strong>удалить</strong> их."
-#~ "<br>По умолчанию, они будут <strong>сохранены</strong>: полученная точка "
-#~ "будет на месте оригинальной точки отношения.</html>"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Передача объектов на сервер. Кол-во: {0}..."
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Неверное количество параметров оператора tags."
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Ожидаемая длина массива 4, получено {0}"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr "По крайней мере, один удаляемый элемент получил пустую коллекцию"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Параметр ''{0}'' не должен быть пустым"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Неверное значение оператора tags: {0}. Оператор tags обнаружил число, "
-#~ "выходящее за пределы допустимого диапазона, например: tags:1 или tags:2-5"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Неверное значение дубля ''{0}''"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Только четыре дубля ожидалось в строке, получено {0}"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr "Не удалось загрузить ресурс ''{0}''. Ошибка: {1}"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr ""
-#~ "Невозможно добавить примитив {0} к набору данных, так как он уже "
-#~ "присутствует"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Ошибка: Неожиданная строка ''{0}'' в списке закладок с сервера"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в списке "
-#~ "закладок с сервера"
-
-#~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the combined way or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
-#~ "take the place of the original way in the membership.</html>"
-#~ msgstr ""
-#~ "<html>Комбинированные линии являются участниками одного или более "
-#~ "отношений. Пожалуйста решите, хотите ли вы <strong>сохранить</strong> "
-#~ "этих участников для комбинированной линии или вы хотите <strong>удалить</"
-#~ "strong> их.<br>По умолчанию они будут <strong>сохранены</strong>: "
-#~ "комбинированная линия будет на месте оригинальной линии отношения.</html>"
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "Строка ''{0}'' не является правильным двойным значением."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Нажмите, чтобы скачать с сервера выделенную область"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Ни <strong>{0}</strong> ни <strong>{1}</strong> не назначено."
-#~ "<br>Пожалуйста выберите, скачать только данные OSM с сервера, или только "
-#~ "данные GPX, или и то и другое.</html>"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Доступные стили (из {0})"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Добавить название файла или ссылку на активные стили"
-
-#~ msgid "Active styles"
-#~ msgstr "Активные стили"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} модуль скачан успешно."
-#~ msgstr[1] "{0} модуля скачаны успешно."
-#~ msgstr[2] "{0} модулей скачано успешно."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Пожалуйста, перезапустите JOSM."
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
-#~ msgstr ""
-#~ "Вы обновили приложение JOSM.\n"
-#~ "Чтобы избежать проблем, модули тоже надо обновить.\n"
-#~ "Обносить модули сейчас?"
-
-#~ msgid "Unconnceted coastline"
-#~ msgstr "Неприсоединённая береговая линия"
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Текущая область для скачивания с сервера</strong> (minlat,"
-#~ "minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr ""
-#~ "Приблизиться к элементу, к которому относится первый выделенный участник"
-
-#~ msgid "autozoom"
-#~ msgstr "Автомасштабирование"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Теги ({0} конфликтов)"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr ""
-#~ "Показывать только полезные подсказки направления (например - с тегом "
-#~ "дороги с односторонним движением)."
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Картинки без тегов"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Добавлен источник авто-тега:"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Неправильная комбинация тегов/значений"
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Модуль геотега для JOSM. Совмещает фотографии с GPS треками или "
-#~ "импортирует геотеги из EXIF фотографий."
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Модуль для совмещения изображения с путевыми точками GPX трека. "
-#~ "Совмещение будет произведено, когда аттрибут тегов 'name', 'cmt' или "
-#~ "'desc' путевой точки, будет совпадать с именем файла изображения."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Инспектор OSM данных. Он проверяет наличие проблем в данных, а также "
-#~ "предлагает исправить некоторые известные общие проблемы. Проверяет "
-#~ "правописание имён тегов."
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Пустое значение удаляет тег."
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Объединить полигоны: короткие линии удаляются"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Только два полигона могут быть объединены в данный момент."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Несколько утилит, которые делают вашу жизнь проще: например, упростить "
-#~ "линию; объединить полигоны; перейти в указанную точку."
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Дочерний элемент<br>{0}<br>удален с сервера. Он не может быть "
-#~ "загружен"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Применить также для дочерних элементов"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
-
-#~ msgid "User with the same uid but different name found"
-#~ msgstr ""
-#~ "Найден пользователь с тем же идентификатором пользователя, но с другим "
-#~ "именем"
-
-#~ msgid "null detected in node list"
-#~ msgstr "обнаружено значение null в списке точек"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Переместите сегмент линии, чтобы создать прямоугольник. Ужерживая Ctrl, "
-#~ "переместите, сегмент вдоль его перпендикуляра."
-
-#~ msgid "unexpected null value for n.getEastNorth(). id of n is"
-#~ msgstr "неожиданное значение null для n.getEastNorth(). id из n"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Отстутствует результат слияния для объекта с id {0}"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
-
-#~ msgid ""
-#~ "Can''t merge because either of the participating primitives is new and "
-#~ "the other is not"
-#~ msgstr ""
-#~ "Слияние невозможно, потому что, один из участвующих элементов новый, а "
-#~ "другой нет"
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "Слияние элементов с различными id невозможно. Этот id: {0}, другой же: {1}"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Can''t deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более "
-#~ "низкой версией {2} не видимый. Это несоответствие невозможно. Полученный "
-#~ "объект сохранён. "
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
-
-#~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "Невозможно сравнить элемент с  ID ''{0}'' и элемент с ID ''{1}''."
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Франция)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "Северная геодезическая система UTM20"
-
-#~ msgid "Downloading relation ''{0}''"
-#~ msgstr "Скачивание отношения ''{0}''  с сервера"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Введите широту в диапазоне -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Пожалуйста, введите правильную долготу в диапазоне -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Пожалуйста , введите правильную широту в диапазоне -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Введите долготу в диапазоне -180..180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Закрыть диалог, не создавая новую точку"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Переключить полноэкранный режим"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Полноэкранный режим"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>Данные в слое GPX ''{0}'' были скачаны с сервера.<br>Так как "
-#~ "путевые точки не содержат меток времени, мы не можем синхронизировать их "
-#~ "с изображениями.</html>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>Данные в слое GPX ''{0}'' были скачаны с сервера.<br>Так как "
-#~ "путевые точки не содержат меток времени, мы не можем синхронизировать их "
-#~ "с аудиоданными.</html>"
-
-#~ msgid "You've encountered a bug in JOSM"
-#~ msgstr "Произошла ошибка при работе в JOSM"
-
-#~ msgid ""
-#~ "<html><p>Alternatively if that doesn't work you can manually fill in the "
-#~ "information<br>below at this URL:</p></html>"
-#~ msgstr ""
-#~ "<html><p>В качестве альтернативы, если это не работает, вы можете вручную "
-#~ "заполнить<br>по этой ссылке:</p></html>"
-
-#~ msgid ""
-#~ "<html><p>You've encountered an error in JOSM. Before you file a "
-#~ "bug<br>make sure you've updated to the latest version of JOSM here:</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Произошла ошибка при работе с JOSM. Прежде чем сообщить о ней, "
-#~ "<br>убедитесь, что вы работаете с последней версией JOSM здесь:</p></html>"
-
-#~ msgid ""
-#~ "<html><p>There the the error information provided below should already "
-#~ "be<br>filled out for you. Please include information on how to "
-#~ "reproduce<br>the error and try to supply as much detail as possible.</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Информация об ошибке уже добавлена ниже<br>для облегчения "
-#~ "работы. Вы только опишите подробно, то, как возникла эта<br>ошибка и "
-#~ "постарайтесь сделать это поподробнее.</p></html>"
-
-#~ msgid ""
-#~ "<html>You should also update your plugins. If neither of those help "
-#~ "please<br>file a bug in our bugtracker using this link:</p></html>"
-#~ msgstr ""
-#~ "<html>Необходимо также обновить модули. Если все вышеперечисленное не "
-#~ "помогло,<br>сообщите нам об ошибке, перейдя по ссылке:</p></html>"
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "Идёт поиск доступных переводов..."
-
-#~ msgid "Checking locales..."
-#~ msgstr "Проверка языков..."
-
-#~ msgid "Loading available locales..."
-#~ msgstr "Загрузка доступных языков..."
-
-#~ msgid "Checking translation for locale ''{0}''"
-#~ msgstr "Проверка перевода для языка ''{0}''"
-
-#~ msgid "({0}/{1}) Uploading {2} objects..."
-#~ msgstr "({0}/{1}) Передача {2} объектов..."
-
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Удалить старый модуль {0}"
-
-#~ msgid "Plugin {0} is no longer necessary and has been deactivated."
-#~ msgstr "Модуль {0} больше не нужен и был деактивирован."
-
-#~ msgid "Delete old plugin file {0}"
-#~ msgstr "Удалить старый файл модуля {0}"
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: Скачивание отношения ''{2}''..."
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Совпало {0} из {1} фотографий с GPX треком."
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Фотографии не содержат информацию о времени"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Выбранные фотографии не содержат информацию о времени."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Модуль Remote Control всегда слушает порт 8111 на localhost. Номер порта "
-#~ "нельзя изменить, так как он является стандартным для сторонних "
-#~ "приложений, подключающихся к модулю."
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr "Неверное значение пакета правок оператора: {0}. Ожидалось число."
-
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "Установить флаг 'modified' для точки {0}"
-
-#~ msgid "Set the 'modified' flag for way {0}"
-#~ msgstr "Установить флаг 'modified' для линии {0}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "Установить флаг 'modified' для отношения {0}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Ожидался параметр ''{0}'' >= 0, получено {1}"
-
-#~ msgid ""
-#~ "Can''t assign a changesetId > 0 to a new primitive. Value of changesetId "
-#~ "is {0}"
-#~ msgstr ""
-#~ "Невозможно назначить changesetId > 0 на новый элемент. Значение "
-#~ "changesetId - {0}"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Невозможно открыть каталог.<br>Пожалуйста, выберите файл!"
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Отсутствует закрывающая скобка"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Открытие {0} файлов..."
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Закрыто"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Открыть"
-
-#~ msgid "Enter a changset id"
-#~ msgstr "Ввести id пакета правок"
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It can't "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences.</html>"
-#~ msgstr ""
-#~ "<html>JOSM запущен от имени анонимного пользователя. Он не может "
-#~ "загрузить<br>ваши пакеты правок с сервера OSM, пока не введено имя "
-#~ "пользователя<br>в настройках JOSM.</html>"
-
-#~ msgid ""
-#~ "The current value isn't a valid changeset ID. Please enter an integer "
-#~ "value > 0"
-#~ msgstr ""
-#~ "Текущее значение не является правильным номером пакета правок. Введите "
-#~ "целое число > 0"
-
-#~ msgid ""
-#~ "Can't restrict changeset query to the current user because the current "
-#~ "user is anonymous"
-#~ msgstr ""
-#~ "Невозможно выбрать пакеты правок текущего пользователя, поскольку текущий "
-#~ "пользователь - анонимный"
-
-#~ msgid ""
-#~ "Alternatively, if that doesn't work you can manually fill in the "
-#~ "informationbelow at this URL:"
-#~ msgstr ""
-#~ "Или же, если что-то не работает вы можете вручную заполнить приведенную "
-#~ "ниже информацию по этому URL:"
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Ожидался параметр ''{0}'' типа точки , получен ''{1}''"
-
-#~ msgid ""
-#~ "There the error information provided below should already befilled in for "
-#~ "you. Please include information on how to reproducethe error and try to "
-#~ "supply as much detail as possible."
-#~ msgstr ""
-#~ "Ниже приведена информация, которая уже должна быть заполнена для вас. "
-#~ "Просьба включить информацию о том, как воспроизвести ошибки и "
-#~ "постарайтесь предоставить детали настолько подробно, насколько это "
-#~ "возможно."
-
-#~ msgid ""
-#~ "You should also update your plugins. If neither of those help pleasefile "
-#~ "a bug report in our bugtracker using this link:"
-#~ msgstr ""
-#~ "Вам также следует обновить модули. Если ничего из этого не помогло, "
-#~ "пожалуйста отправьте сообщение об ошибке на багтрекере, используя эту "
-#~ "ссылку:"
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Ожидалось значение типа long > 0 для параметра ''{0}'', получено {1}"
-
-#~ msgid "Authorise now"
-#~ msgstr "Авторизоваться"
-
-#~ msgid "Incorrect value of version operator: {0}. Number is expected."
-#~ msgstr "Неправильное значение версии оператора: {0}. Ожидается число."
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr "Ожидаемое значение цело > 0 для параметра ''{0}'', получено ''{1}''"
-
-#~ msgid ""
-#~ "<html>The selected object isn''t available in the current<br>edit layer "
-#~ "''{0}''.</html>"
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer ''{0}''.</html>"
-#~ msgstr[0] ""
-#~ "<html>Выбранный объект не доступен в текущем<br> редактируемом слое "
-#~ "''{0}''.</html"
-#~ msgstr[1] ""
-#~ "<html>Ни один из выделенных объектов не доступен в текущем<br> "
-#~ "редактируемом слое ''{0}''.</html>"
-#~ msgstr[2] ""
-#~ "<html>Ни один из выделенных объектов не доступен в текущем<br> "
-#~ "редактируемом слое ''{0}''.</html>"
-
-#~ msgid "Can''t restrict the changeset query to the user name ''{0}''"
-#~ msgstr ""
-#~ "Невозможно ограничить запрос пакета правок для пользователя с именем "
-#~ "''{0}''"
-
-#~ msgid ""
-#~ "Can't build changeset query with time based restrictions. Input isn't "
-#~ "valid."
-#~ msgstr ""
-#~ "Невозможно выполнить запрос пакета правок на основе ограничений по "
-#~ "времени. Введено неверное значение."
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Приблизиться к элементам содержимого этого пакета правок в текущем слое "
-#~ "данных"
-
-#~ msgid "Current value ''{0}'' for user ID isn''t valid"
-#~ msgstr "Неверное текущее значение ''{0}'' для ID пользователя"
-
-#~ msgid "Please enter the password name of your OSM account"
-#~ msgstr "Пожалуйста, введите пароль для имени вашего аккаунта OSM"
-
-#~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
-#~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">настроить пакет правок</a>)"
-
-#~ msgid "Authorise URL:"
-#~ msgstr "URL авторизации:"
-
-#~ msgid ""
-#~ "<html><body>Please enter an OAuth Access Token which is authorised to "
-#~ "access the OSM server ''{0}''.</body></html>"
-#~ msgstr ""
-#~ "<html><body>Пожалуйста, введите маркер доступа OAuth, который авторизует "
-#~ "доступ к серверу OSM \"{0}\".</body></html>"
-
-#~ msgid ""
-#~ "<html>The automatic process for retrieving an OAuth Access Token<br>from "
-#~ "the OSM server failed.<br><br>Please try again or choose another kind of "
-#~ "authorisation process,<br>i.e. semi-automatic or manual authorisation.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Автоматический процесс получения маркера доступа OAuth<br>с сервера "
-#~ "OSM не удался.<br><br>Пожалуйста, попытайтесь ещё раз или выберите другой "
-#~ "процесс авторизации,<br>например, полуавтоматический или авторизацию "
-#~ "вручную.</html>"
-
-#~ msgid "OAuth authorisation failed"
-#~ msgstr "Авторизация OAuth не удалась"
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Не линия в мультиполигоне."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Внутренняя линия снаружи мультиполигона."
-
-#~ msgid "Close the dialog and cancel authorisation"
-#~ msgstr "Закрыть диалог и отменить авторизацию"
-
-#~ msgid "Uploading {0} objects..."
-#~ msgstr "Загрузка {0} объектов на сервер..."
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -49174,1975 +44640,152 @@
 
 #~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Операция передачи на сервер и/или сохранения одного слоя с "
+#~ "правками<br>была отменена или не удалась.</html>"
+#~ msgstr[1] ""
+#~ "<html>Операция передачи на сервер и/или сохранения {0} слоёв с "
+#~ "правками<br>была отменена или не удалась.</html>"
+#~ msgstr[2] ""
+#~ "<html>Операция передачи на сервер и/или сохранения {0} слоёв с "
+#~ "правками<br>была отменена или не удалась.</html>"
+
+#~ msgid ""
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "В скопированных данных присутствуют неполные элементы. После вставки, "
-#~ "неполные эоементы будут удалены. Вы хотите вставить данные без неполных "
-#~ "элементов?"
-
-#~ msgid "Warning: the revision file '/REVISION' is missing."
-#~ msgstr "Предупреждение: файл изменений '/REVISION' отсутствует."
+#~ "Игнорирование ошибки, так как скачивание было отменено. Текст ошибки: {0}"
 
 #~ msgid ""
-#~ "Parameters --download, --downloadgps and --selection are processed in "
-#~ "this order."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Параметры --download, --downloadgps и --selection обрабатываются в этом "
-#~ "порядке."
-
-#~ msgid "Run the automatic authorisation steps again"
-#~ msgstr "Запустить процедуру автоматической авторизации ещё раз"
-
-#~ msgid "loading plugin ''{0}''"
-#~ msgstr "звгрузка с сервера модуля ''{0}''"
+#~ "Предупреждение: игнорирование ошибки, потому что задание отменено. "
+#~ "Ошибка: {0}"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Всегда обновлять не спрашивая"
 
 #~ msgid ""
-#~ "A required plugin for plugin {0} was not found. The required plugin is:"
-#~ msgid_plural ""
-#~ "{1} required plugins for plugin {0} were not found. The required plugins "
-#~ "are:"
-#~ msgstr[0] ""
-#~ "Модуль, необходимый для модуля {0} не был найден. Необходим модуль:"
-#~ msgstr[1] ""
-#~ "{1} модуля, необходимых для модуля {0} не было найдено. Необходимы модули:"
-#~ msgstr[2] ""
-#~ "{1} модулей, необходимых для модуля {0} не было найдено. Необходимы "
-#~ "модули:"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
+#~ msgstr ""
+#~ "<html>Как альтернативу, вы можете ввести <strong>адрес квадрата</strong> "
+#~ "для отдельного квадрата в формате <i>zoomlevel/x/y</i>, например: "
+#~ "<i>15/256/223</i>. Адреса квадратов в формате <i>zoom,x,y</i> или <i>zoom;"
+#~ "x;y</i> тоже корректны.</html>"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Открыть редактор для выделенного ограничения на поворот"
+
+#~ msgid "Both"
+#~ msgstr "Оба"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Исправить адресацию"
 
 #~ msgid ""
-#~ "Please open the Preference Dialog after JOSM has started and try to "
-#~ "update them manually."
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "Пожалуйста, откройте диалог настроек после запуска JOSM и попытайтесь "
-#~ "обновить их вручную."
-
-#~ msgid "Removing umaintained plugins..."
-#~ msgstr "Удаление неподдерживаемых модулей..."
+#~ "(установите \"{0}\" yes/no/ask в настройках\n"
+#~ "для управления автоматической загрузкой калибровочных данных)"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "Файл с данными для калибровки рисунка не найден:"
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
+#~ msgstr ""
+#~ "Также, с этого момента, калибровочные файлы будут загружаться "
+#~ "автоматически."
 
 #~ msgid ""
-#~ "The current value isn't a valid user ID. Please enter an integer value > 0"
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "Текущее значение ID неверно. Пожалуйста введите целое положительное "
-#~ "значение"
+#~ "Установите для \"{0}\" yes/no/ask в настройках для управления\n"
+#~ "автоматической загрузкой калибровочных данных."
 
 #~ msgid ""
-#~ "<html>The  current value isn't a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr ""
-#~ "<html>Текущее значение имени пользователя неверно.<br>Пожалуйста, введите "
-#~ "не пустое значение.</html>"
-
-#~ msgid "Please select an authorisation procedure: "
-#~ msgstr "Пожалуйста выберите способ авторизации: "
-
-#~ msgid "Authorise JOSM to access the OSM API"
-#~ msgstr "Авторизуйтесь в JOSM, чтобы получить доступ к OSM API"
-
-#~ msgid "The user name can't be empty. Please enter your OSM user name"
-#~ msgstr ""
-#~ "Имя пользователя не может быть пустым. Пожалуйста, введите ваше имя "
-#~ "пользователя в OSM"
-
-#~ msgid "The password can't be empty. Please enter your OSM password"
-#~ msgstr "Пароль не может быть пустым. Пожалуйста, введите ваш OSM-пароль"
-
-#~ msgid ""
-#~ "Can't merge because either of the participating primitives is new and the "
-#~ "other is not"
-#~ msgstr ""
-#~ "Объединение невозможно, потому что одни элементы, участвующие в "
-#~ "объединении новые, а другие нет"
-
-#~ msgid ""
-#~ "Can't restrict the changeset query to a specific bounding box. The input "
-#~ "is invalid."
-#~ msgstr ""
-#~ "Невозможно ограничить запрос пакета правок для конкретной рамки выбора. "
-#~ "Ввод неудачен."
-
-#~ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-#~ msgstr ""
-#~ "<html>GPS треку сопоставлено <b>{0}</b> из <b>{1}</b> фотографий.</html>"
-
-#~ msgid ""
-#~ "<html>You updated your JOSM software.<br>To prevent problems the plugins "
-#~ "should be updated as well.<br><br>Update plugins now?</html>"
-#~ msgstr ""
-#~ "<html>Вы обновили приложение JOSM.<br>Чтобы чтобы не возникало проблем, "
-#~ "необходимо также обновить и модули.<br><br>Обновить модули сейчас?</html>"
-
-#~ msgid "Failed to authorise OAuth request  ''{0}''"
-#~ msgstr "Не удалось выполнить запрос OAuth ''{0}''"
-
-#~ msgid "Authorising OAuth Request token ''{0}'' at the OSM website ..."
-#~ msgstr "Авторизация маркера запроса OAuth ''{0}'' на вебсайте OSM..."
-
-#~ msgid ""
-#~ "You don't have an Access Token yet to access the OSM server using OAuth. "
-#~ "Please authorise first."
-#~ msgstr ""
-#~ "У вас еще нет маркера доступа для доступа к серверу OSM, с помощью OAuth. "
-#~ "Пожалуйста, сначала авторизуйтесь."
-
-#~ msgid ""
-#~ "Click to step through the OAuth authorisation process and generate a new "
-#~ "Access Token"
-#~ msgstr ""
-#~ "Нажмите, чтобы пройти через процесс авторизации OAuth и сгенерить новый "
-#~ "маркер доступа"
-
-#~ msgid "Click to step through the OAuth authorisation process"
-#~ msgstr "Нажмите, чтобы пройти через процесс авторизации OAuth"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Проверить замечания к рисунку"
-
-#~ msgid ""
-#~ "<html>Could not retrieve the list of your open changesets because<br>JOSM "
-#~ "doesn't know your identity.<br>You've either chosen to work anonymously "
-#~ "or you are not entitled<br>to know the identity of the user on whose "
-#~ "behalf you are working.</html>"
-#~ msgstr ""
-#~ "<html>Невозможно получить список ваших открытых пакетов правок, потому "
-#~ "что<br>JOSM не знает, кто вы.<br>Либо вы работаете анонимно, либо вы не "
-#~ "<br>наделены правом знать удостоверение пользователя, от имени которого "
-#~ "вы работаете.</html>"
-
-#~ msgid ""
-#~ "<html>Select to restrict the query to your changsets only.<br>Unselect to "
-#~ "include all changesets in the query.</html>"
-#~ msgstr ""
-#~ "<html>Отметьте для запроса только к вашему пакету правок.<br>Снимите "
-#~ "отметку, чтобы включить в запрос все пакеты правок.</html>"
-
-#~ msgid ""
-#~ "The server reported that the current changset was closed.<br>This is most "
-#~ "likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server ''{1}''."
-#~ msgstr ""
-#~ "Сервер сообщил, что текущий пакет правок был закрыт.<br>Скорее всего это "
-#~ "произошло потому, что размер пакета правок превысил макс. размер <br>({0} "
-#~ "объектов) на сервере ''{1}''."
-
-#~ msgid "Click to redirect you to the authorisation form on the JOSM web site"
-#~ msgstr ""
-#~ "Нажмите, чтобы перенаправить вас к форме авторизации на веб-сайте JOSM"
-
-#~ msgid "Authorising request token ''{0}''..."
-#~ msgstr "Авторизация маркера запроса ''{0}''..."
-
-#~ msgid "<html>Step 2/3: Authorise and retrieve an Access Token</html>"
-#~ msgstr "<html>Шаг 2/3: Авторизация и извлечение маркера доступа</html>"
-
-#~ msgid ""
-#~ "Failed to update primitive with id {0} because current edit layer doesn't "
-#~ "include such a primitive"
-#~ msgstr ""
-#~ "Не удалось обновить элементы с id {0}, потому что текущий слой "
-#~ "редактирования не содержит этот элемент"
-
-#~ msgid "Retrieving user details with Access Token Key ''{0}'' was forbidded."
-#~ msgstr ""
-#~ "Извлечение данных пользователя с ключом маркера доступа ''{0}'' было "
-#~ "запрещено."
-
-#~ msgid "The current value isn't a valid URL"
-#~ msgstr "Текущее значение не является правильной URL"
-
-#~ msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-#~ msgstr "<html>Невозможно прочитать файлы.<br> Ошибка: <br>{0}</html>"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Предупреждение: отсутствует параметр ''{0}''."
-
-#~ msgid "The plugin file ''{0}'' doesn't include a Manifest."
-#~ msgstr "Файл модуля ''{0}'' не содержит декларацию."
-
-#~ msgid ""
-#~ "<html>Can''t upload {0} objects in one request because the<br>max. "
-#~ "changeset size {1} on server ''{2}'' is exceeded.</html>"
-#~ msgstr ""
-#~ "<html>Невозможно передать на сервер {0} объектов в одном запросе, потому "
-#~ "что<br> превышен макс. размер пакета правок {1} на сервере ''{2}''.</html>"
-
-#~ msgid ""
-#~ "Warning: Failed to retrieve user infos for the current JOSM user. "
-#~ "Exceptions was: {0}"
-#~ msgstr ""
-#~ "Предупреждение: Не удалось получить данные о текущем пользователе JOSM. "
-#~ "Исключения были: {0}"
-
-#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Ожидолось значение типа integer > 0 для параметра ''{0}'', получено {1}"
-
-#~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link isn''t known. "
-#~ "Skipping download."
-#~ msgstr ""
-#~ "Предупреждение: Невозможно скачать с сервера модуль ''{0}''. Ссылка для "
-#~ "скачивания неизвестна. Скачивание пропущено."
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr "Ожидался уникальный id > 0 для элемента, получено {0}"
-
-#~ msgid ""
-#~ "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM "
-#~ "server at ''{1}''.<br>You''re accessing the OSM server as user ''{2}'' "
-#~ "with id ''{3}''.</html>"
-#~ msgstr ""
-#~ "<html>Маркер доступа ''{0}'' применён успешно для<br>доступа к серверу "
-#~ "OSM ''{1}''.<br>Вы имеете доступ к серверу OSM в качестве пользователя "
-#~ "''{2}'' с id ''{3}''.</html>"
-
-#~ msgid ""
-#~ "<html>''{0}'' isn't a valid OSM API URL.<br>Please check the spelling and "
-#~ "validate again.</html>"
-#~ msgstr ""
-#~ "<html>''{0}'' не является правильной URL OSM API.<br>Пожалуйста, "
-#~ "проверьте написание попробуйте снова.</html>"
-
-#~ msgid ""
-#~ "<html>The test failed because the server responded with an internal error."
-#~ "<br>JOSM couldn''t decide whether the token is valid. Please try again "
-#~ "later.</html>"
-#~ msgstr ""
-#~ "<html>Тест не прошёл, потому что сервер ответил о наличии внутренней "
-#~ "ошибки.<br>JOSM не может решить, верный ли маркер. Пожалуйста, "
-#~ "попытайтесь ещё раз, через некоторое время.</html>"
-
-#~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' isn''t "
-#~ "a valid URL. Skipping download."
-#~ msgstr ""
-#~ "Предупреждение: Невозможно скачать модуль ''{0}''. Ссылка на скачивание с "
-#~ "сервера ''{1}'' не верная URL. Скачивание пропущено."
-
-#~ msgid ""
-#~ "<html>Run a fully automatic procedure to get an access token from the OSM "
-#~ "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-#~ "fully<br>automatically authorises the user and retrieves an Access Token."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Запустить полностью автоматическую процедуру получения маркера "
-#~ "доступа с вебсайта OSM.<br>JOSM использует доступ к вебсайту OSM от имени "
-#~ "пользователя JOSM и полностью<br>автоматически авторизует пользователя и "
-#~ "получает маркер доступа.</html>"
-
-#~ msgid ""
-#~ "<html>You''ve sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>Вы успешно извлекли маркер доступа OAuth с вебсайта OSM. Нажмите на "
-#~ "<strong>{0}</strong> чтобы принять маркер. JOSM будет использовать его в "
-#~ "последующих запросах, чтобы получить доступ к API OSM.</html>"
-
-#~ msgid ""
-#~ "Illegal document structure. Found node, way, or relation outside of "
-#~ "'create', 'modify', or 'delete'."
-#~ msgstr ""
-#~ "Неверная структура документа. Найдены node, way, или relation за "
-#~ "пределами 'create', 'modify' или 'delete'."
-
-#~ msgid "OSM website didn''t reply a session cookie in response to ''{0}'',"
-#~ msgstr "Вебсайт OSM не ответил сессией кукисов в ответ на запрос ''{0}'',"
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Идентификация личности на прокси HTTP ''{0}'' не удалась. "
-#~ "Пожалуйста, введите правильные имя пользователя и пароль.</html>"
-
-#~ msgid ""
-#~ "<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
-#~ "username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>Идентификация личности в OSM API ''{0}'' не удалась . Пожалуйста, "
-#~ "введите правильные имя пользователя и пароль.</html>"
-
-#~ msgid ""
-#~ "<html>Warning: depending on the authentication method the proxy server "
-#~ "uses the password may be transferred unencrypted.</html>"
-#~ msgstr ""
-#~ "<html>Предупреждение: в зависимости от метода Идентификации личности, "
-#~ "пароль, который использует прокси-сервер, может передаваться в "
-#~ "незашифрованном виде.</html>"
-
-#~ msgid ""
-#~ "<html><body>JOSM has successfully retrieved an Access Token. You can now "
-#~ "accept this token. JOSM will used it the future for authentication and "
-#~ "authorisation at the OSM server.<br><br>The access token is: "
-#~ msgstr ""
-#~ "<html><body>JOSM успешно извлёк маркер доступа. Теперь вы можете принять "
-#~ "этот маркер. JOSM будет использовать его в будущем для авторизации и "
-#~ "идентификации личности на сервере JOSM.<br><br>Маркер доступа: "
-
-#~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-#~ msgstr ""
-#~ "Не удалось добавить заголовок идентификации личности OAuth. В настоящее "
-#~ "время нет настроенного маркера доступа OAuth."
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "Предупреждение: Ошибка инициализации настроек. Каталог настроек ''{0}'' "
-#~ "не является каталогом."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Ошибка инициализации настроек.<br>Каталог настроек ''{0}'' не "
-#~ "является каталогом.</html>"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Невозможно открыть соединение с удаленным сервером<br>''{0}''."
-#~ "<br>Хост с именем ''{1}'' не отвечает. <br>Пожалуйста проверьте адрес API "
-#~ "в настройках программы и ваше соединение с интернет.</html>"
-
-#~ msgid ""
-#~ "Warning: JOSM is configured to use proxies from the system setting, but "
-#~ "the JVM is not configured to retrieve them. Resetting preferences to 'No "
-#~ "proxy'"
-#~ msgstr ""
-#~ "Предупреждение: JOSM настроен так, чтобы использовать прокси из системных "
-#~ "настроек, но JVM не настроен использовать их. Настройки будут сброшены к "
-#~ "'No proxy'"
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "Параметр с ключом ''{0}'' не существует. Невозможно восстановить "
-#~ "геометрию окна с помощью параметров."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Позволяет пользователю создавать различные цветовые схемы и переключаться "
-#~ "между ними. Просто измените цвет и создайте новую схему. Используется для "
-#~ "переключения на белый фон с соответствующими цветами для большей "
-#~ "наглядности при ярком солнечном свете. См. окно настроек JOSM и "
-#~ "\"Настройки карты\" (странно, но это так :-)"
-
-#~ msgid ""
-#~ "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-#~ "changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
-#~ "dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return "
-#~ "to map editing.<br>"
-#~ msgstr ""
-#~ "Нажмите ''<strong>{0}</strong>'' чтобы продолжить передачу на сервер в "
-#~ "дополнительные пакеты правок.<br>Нажмите ''<strong>{1}</strong>'', чтобы "
-#~ "вернуться к диалогу передачи на сервер.<br>Нажмите ''<strong>{2}</"
-#~ "strong>'', чтобы отменить передачу на сервер и вернуться к редактированию "
-#~ "карты.<br>"
-
-#~ msgid ""
-#~ "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-#~ "installation. JOSM still going to load the old plugin version."
-#~ msgstr ""
-#~ "Предупреждение: не удалось установить уже скачанный с сервера модуль "
-#~ "''{0}''. Установка пропущена. JOSM собирается загрузить старую версию "
-#~ "модуля."
-
-#~ msgid ""
-#~ "Warning: ignoring changeset id {0} for new object with external id {1} "
-#~ "and internal id {2}"
-#~ msgstr ""
-#~ "Предупреждение: игнорирование пакета id пакета правок {0} для нового "
-#~ "объекта с внешним id {1} и внутренним id {2}"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
-#~ "<br>Невозможно добавить данный конфликт.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Предупреждение: Слой ''{0}'' больше не существует. Невозможно удалить "
-#~ "конфликт для элемента ''{1}''."
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Полученный объект с id {0} и версией {1} видимый, хотя оригинал с более "
-#~ "низкой версией {2} не видимый. Это несоответствие невозможно. Полученный "
-#~ "объект сохранён. "
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "Линия \"from\" (от) не начинается или заканчивается на точке \"via"
-#~ "\" (через)."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr ""
-#~ "Линия \"to\" (до) не начинается и не заканчивается на точке \"via"
-#~ "\" (через)."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "Линия \"from\" (от) не начинается и не заканчивается на линии \"via"
-#~ "\" (через)."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr ""
-#~ "Линия \"to\" (до) не начинается и не заканчивается на линии \"via"
-#~ "\" (через)."
-
-#~ msgid ""
-#~ "<html>You did not finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Вы не закончили слияние изменений в этом конфликте.<br>Улаживание "
-#~ "конфликтов не может быть применено до тех пор, пока все все конфликты не "
-#~ "будут улажены.<br>Нажатие на <strong>'{0}'</strong>, закроет диалог. "
-#~ "<strong> Однако<br> неулаженные конфликты при этом не будут применены.</"
-#~ "strong><br>Если же нажать на <strong>{1}</strong>, то вы вернётесь к "
-#~ "улаживанию конфликтов.</html>"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Дочерний элемент<br>{0}<br>удален с сервера. Он не может быть "
-#~ "загружен"
-
-#~ msgid ""
-#~ "Alternatively, if that does not work you can manually fill in the "
-#~ "informationbelow at this URL:"
-#~ msgstr ""
-#~ "Или же, если что-то не работает вы можете вручную заполнить приведенную "
-#~ "ниже информацию по этому URL:"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Восстановить {0} элемент"
-#~ msgstr[1] "Восстановить {0} элемента"
-#~ msgstr[2] "Восстановить {0} элементов"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "Node {0} cannot be added to the way because it was deleted"
-#~ msgstr ""
-#~ "Точка {0} не может быть добавлена к линии, потому что она была удалена"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Имеется {0} дополнительная точка, используемая в линии {1}<br>, которая "
-#~ "удалена на сервере.<br><br>Вы хотите восстановить и эту точку тоже?"
-#~ msgstr[1] ""
-#~ "Имеется {0} дополнительные точки, используемых в линии {1}<br>, которые "
-#~ "удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
-#~ msgstr[2] ""
-#~ "Имеется {0} дополнительных точек, используемых в линии {1}<br>, которые "
-#~ "удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Имеется {0} дополнительный элемент, входящий в отношение {1}<br>, который "
-#~ "удалён на сервере.<br><br>Вы хотите восстановить и этот элемент тоже?"
-#~ msgstr[1] ""
-#~ "Имеется {0} дополнительных элемента, входящие в отношение {1}<br>, "
-#~ "которые удалены на сервере.<br><br>Вы хотите восстановить и эти элементы "
-#~ "тоже?"
-#~ msgstr[2] ""
-#~ "Имеется {0} дополнительных элементов, входящих в отношение {1}<br>, "
-#~ "которые удалены на сервере.<br><br>Вы хотите восстановить и эти элементы "
-#~ "тоже?"
-
-#~ msgid ""
-#~ "Primitive {0} cannot be added to the relation because it was deleted."
-#~ msgstr ""
-#~ "Элемент {0} не может быть добавлен к отношению, потому что он был удалён."
-
-#~ msgid "Authenticationi failed"
-#~ msgstr "Идентификация не удалась"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Вы назначили пустую роль на {0} элемент."
-#~ msgstr[1] "Вы назначили пустую роль на {0} элемента."
-#~ msgstr[2] "Вы назначили пустую роль на {0} элементов."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Это эквивалентно удалению ролей из этих элементов."
-
-#~ msgid "GPS point"
-#~ msgstr "точка GPS"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "горный_туризм"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "горный_туризм_по_разрешению"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "альпинизм"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "альпинизм_по_разрешению"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "сложный_альпинизм"
-
-#~ msgid "Indipend."
-#~ msgstr "Indipend."
-
-#~ msgid ""
-#~ "<html>You have sucessfully retrieved an OAuth Access Token from the OSM "
-#~ "website. Click on <strong>{0}</strong> to accept the token. JOSM will use "
-#~ "it in subsequent requests to gain access to the OSM API.</html>"
-#~ msgstr ""
-#~ "<html>Вы успешно получили маркер доступа OAuth с вебсайта OSM. Нажмите на "
-#~ "<strong>{0}</strong> чтобы подтвердить маркер. JOSM будет использовать "
-#~ "его в последующих запросах к OSM API.</html>"
-
-#~ msgid "Do not check and ask again at startup (remembers choice)"
-#~ msgstr "Не проверять и не спрашивать при загрузке (запомнить выбор)"
-
-#~ msgid ""
-#~ "You have encountered an error in JOSM. Before you file a bug reportmake "
-#~ "sure you have updated to the latest version of JOSM here:"
-#~ msgstr ""
-#~ "Произошла ошибка при работе JOSM. Прежде чем вы сообщите нам о "
-#~ "произошедшей ошибке, убедитесь, что вы используете последнюю версию JOSM:"
-
-#~ msgid ""
-#~ "When one or more ways are selected, the shape is adjusted such, that all "
-#~ "angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-#~ "Then, the direction is fixed by these two reference nodes.(Afterwards, "
-#~ "you can undo the movement for certain nodes:<br>Select them and press the "
-#~ "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
-#~ msgstr ""
-#~ "Когда выделена одна или более линий, форма будет изменена так, чтобы "
-#~ "каждый угол стал или 90 или 180 градусов.<h3>Вы можете дополнительно "
-#~ "выделить ещё две любые произвольные точки (не на этих линиях). Тогда, "
-#~ "направление будет определено этими двумя вспомогательными точками. (При "
-#~ "необходимости, вы сможете отменить передвижение некоторых передвинувшихся "
-#~ "точек:<br>Выделите их и нажмите клавиатурное сокращение "
-#~ "\"Ортогонализовать/Отмена\". По умолчанию это: Shift-Q.)"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr ""
-#~ "Выстроить точки таким образом, чтобы углы между линиями были 90 или 180 "
-#~ "градусов"
-
-#~ msgid ""
-#~ "<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 do not 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, ''.''/Period 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>"
-#~ msgstr ""
-#~ "<p>Вы можете заметить, что список выбираемых клавиш на следующей странице "
-#~ "содержит все клавиши, которые имеются на всех типах клавиатур известных "
-#~ "Java, а не только те клавиши, которые есть на вашей клавиатуре. "
-#~ "Пожалуйста, используйте только те значения, которые относятся к реально "
-#~ "существующим клавишам на вашей клавиатуре. То есть, если на вашей "
-#~ "клавиатуре нет клавиши ''Copy'' (её нет на клавиатуре PC, но присутствует "
-#~ "на клавиатуре Sun), не используйте её. Также имеются некоторые "
-#~ "''значения'', которые вызываются комбинацией клавиш (например '':'' - "
-#~ "двоеточие). Пожалуйста, также не используйте их, используйте вместо них "
-#~ "базовые клавиши (например '';'' - точку_с_запятаей на клавиатуре US, "
-#~ "''.'' - точку на клавиатуре German,...). Если вы не послушаетесь совета - "
-#~ "могут возникнуть конфликты, так как нет способа указать JOSM, что Ctrl"
-#~ "+Shift+; и Ctrl+: это одно и то же, на клавиатуре US...</p>"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr ""
-#~ "<html>Невозможно открыть каталог.<br>Пожалуйста, выделите файл!</html>"
-
-#~ msgid "Error: "
-#~ msgstr "Ошибка: "
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Отсутствует содержимое раздела справки</"
-#~ "p><p class=\"warning-body\">Содержимое справки для раздела справки "
-#~ "<strong>{0}</strong> ещё не написано. И ({1}), и английский вариант пока "
-#~ "отсутствуют.<br><br>Пожалуйста, помогите улучшить справочную систему JOSM "
-#~ "и заполните отсутствующую информацию. Вы можете отредактировать "
-#~ "справочный раздел <a href=\"{2}\">, на вашем ({1}) языке</a> и <a href="
-#~ "\"{3}\"> - раздел на английском</a>.</p></html>"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Предупреждение: разборка стилей Mappaint из ''{0}'' не удалась. Текст "
-#~ "ошибки: {1}"
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Предупреждение: невозможно получить доступ к каталогу ''{0}'' из-за "
-#~ "защиты данных. Текст ошибки: {1}"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr "Передвинуть точки так, чтобы получились углы 90 или 180 градусов"
-
-#~ msgid "Download Object"
-#~ msgstr "Скачать объект с сервера"
-
-#~ msgid "Use all mine elements"
-#~ msgstr "Использовать все мои элементы"
-
-#~ msgid "Josminator - Just do it!"
-#~ msgstr "Josminator - Просто делай это!"
-
-#~ msgid "Exec"
-#~ msgstr "Выполнить"
-
-#~ msgid "Execute Script"
-#~ msgstr "Выполнить сценарий"
-
-#~ msgid "Use all their elements"
-#~ msgstr "Использовать все чужие элементы"
-
-#~ msgid ""
-#~ "Following primitives could not be added because they are deleted: {0}"
-#~ msgstr ""
-#~ "Следующие элементы не могут быть добавлены, потому что они удалены: {0}"
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Автоматический выбор первого слоя WMS во время захвата, если слоёв "
-#~ "несколько."
-
-#~ msgid "Dsdfasdfsdfotos"
-#~ msgstr "Dsdfasdfsdfotos"
-
-#~ msgid "Do some stuff"
-#~ msgstr "Сделать некоторое действие"
-
-#~ msgid ""
-#~ "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or "
-#~ "Mono) to be runnign."
-#~ msgstr ""
-#~ "Рисует здания из карты Чешского кадастра. Для запуска нужен TracerServer "
-#~ "(.NET или Mono)."
-
-#~ msgid "nice Plugin"
-#~ msgstr "Модуль nice"
-
-#~ msgid "show"
-#~ msgstr "показать"
-
-#~ msgid "Native Password Manager Plugin: "
-#~ msgstr "Модуль Native Password Manager: "
-
-#~ msgid "don't change my settings"
-#~ msgstr "не менять мои настройки"
-
-#~ msgid ""
-#~ "Cannot open {0} file because no suitable file importer is available. "
-#~ "Skipping the following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files because no suitable file importer is available. "
-#~ "Skipping the following files:"
-#~ msgstr[0] ""
-#~ "Невозможно открыть {0} файл, потому что отсутствует подходящий импортёр "
-#~ "файлов. Пропущены следующие файлы:"
-#~ msgstr[1] ""
-#~ "Невозможно открыть {0} файла, потому что отсутствует подходящий импортёр "
-#~ "файлов. Пропущены следующие файлы:"
-#~ msgstr[2] ""
-#~ "Невозможно открыть {0} файлов, потому что отсутствует подходящий импортёр "
-#~ "файлов. Пропущены следующие файлы:"
-
-#~ msgid ""
-#~ "Cannot open {0} file with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgid_plural ""
-#~ "Cannot open {0} files with the file importer ''{1}''. Skipping the "
-#~ "following files:"
-#~ msgstr[0] ""
-#~ "Невозможно открыть {0} файл с помощью импортёра ''{1}''. Пропущены "
-#~ "следующие файлы:"
-#~ msgstr[1] ""
-#~ "Невозможно открыть {0} файла с помощью импортёра ''{1}''. Пропущены "
-#~ "следующие файлы:"
-#~ msgstr[2] ""
-#~ "Невозможно открыть {0} файлов с помощью импортёра ''{1}''. Пропущены "
-#~ "следующие файлы:"
-
-#~ msgid "<number>"
-#~ msgstr "<число>"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Объединение удалённых элементов не удалось"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Следующие элементы не могут быть скопированы в место назначения "
-#~ "элементов<br>потому что они удалены в наборе данных места назначения:"
-
-#~ msgid "Use all my elements"
-#~ msgstr "Использовать все мои элементы"
-
-#~ msgid "Image zoom interpolation:"
-#~ msgstr "Интерполяция масштаба изображения:"
-
-#~ msgid "Icon paths"
-#~ msgstr "Пути к пиктораммам"
-
-#~ msgid "range"
-#~ msgstr "диапазон"
-
-#~ msgid "football"
-#~ msgstr "американский футбол"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Стиль для внутренней линии ''{0}'' такой же, как у мультиполигона."
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Присоединённая самоперекрывающаяся область"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Уладить конфликты"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Не улаживать конфликт между видимыми состояниями"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
-#~ "<br>Пожалуйста, уладьте этот конфликт, прежде чем продолжать.</html>"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} конфликт был <strong>улажен автоматически</strong> путём очистки {0} "
-#~ "объекта<br>из локального набора данных, так как объект уже был удалён на "
-#~ "сервере."
-#~ msgstr[1] ""
-#~ "{0} конфликта было <strong>улажено автоматически</strong> путём очистки "
-#~ "{0} объектов<br>из локального набора данных, так как объекты уже были "
-#~ "удалёны на сервере."
-#~ msgstr[2] ""
-#~ "{0} конфликтов было <strong>улажено автоматически</strong> путём очистки "
-#~ "{0} объектов<br>из локального набора данных, так как объекты уже были "
-#~ "удалёны на сервере."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "Осталось уладить {0} конфликт.<br><br>Пожалуйста, откройте диалог списка "
-#~ "конфликтов и уладьте конфликт вручную."
-#~ msgstr[1] ""
-#~ "Осталось уладить {0} конфликта.<br><br>Пожалуйста, откройте диалог списка "
-#~ "конфликтов и уладьте конфликты вручную."
-#~ msgstr[2] ""
-#~ "Осталось уладить {0} конфликтов.<br><br>Пожалуйста, откройте диалог "
-#~ "списка конфликтов и уладьте конфликты вручную."
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Приблизиться к соответствующим элементам в текущем слое данных"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Извлечь основание здания"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Быстрая карта"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Автомасштабирование: "
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Уровень мин. масштаб: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Уровень макс. масштаб: "
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr ""
-#~ "Дублирование горячей клавиши для кнопки '{0}' - кнопка будет "
-#~ "проигнорирована!"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Предоставить фоновый слой который отображает сетку на карте"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Отображает фоновый рисунок OpenLayers"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Разрешить другим приложениям посылать команды в JOSM."
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Испорчена заготовка тегов \"{0}-{1}\" - количество элементов в "
-#~ "display_values должно быть такое же, как и в values"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Изображение создано неудачно."
-
-#~ msgid "loading plugin ''{0}'' ({1})"
-#~ msgstr "загрузка модуля ''{0}'' ({1})"
-
-#~ msgid ""
-#~ "<html>Failed to download data.Its format is either unsupported, ill-"
-#~ "formed, and/or inconsistent.<br><br>Details(untranslated): {0}</html>"
-#~ msgstr ""
-#~ "<html>Не удалось загрузить данные. Данный формат либо не поддерживается, "
-#~ "либо плохо сформирован, и/или неполный.<br><br>Подробности (англ.): {0}</"
-#~ "html>"
-
-#~ msgid "Set width of building"
-#~ msgstr "Задайте ширину здания"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Укажите противоположный конец здания"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Укажите угол здания чтобы начать отрисовку"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Невозможно загрузить модуль {0}, потому что основной "
-#~ "класс<br>модуля ''{1}'' не найден.<br>Удалить из настроек?"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Пожалуйста, введите ваши имя пользователя OSM и пароль. Пароль <strong>не "
-#~ "будет</strong> сохранён в открытом виде в параметрах JOSM и будет передан "
-#~ "на сервер OSM <strong>только один раз</strong>. Все дальнейшие запросы "
-#~ "загрузок на сервер больше не будут использовать ваш пароль."
-
-#~ msgid ""
-#~ "With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-#~ "your behalf (<a href=\"urn:josm-oauth-info\">more info...</a>)."
-#~ msgstr ""
-#~ "Используя OAuth, вы предоставляете право JOSM загружать данные карты и "
-#~ "треки GPS tracks от вашего имени (<a href=\"urn:josm-oauth-info"
-#~ "\">подробнее...</a>)."
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Скачать и показать историю выбранных элементов"
-
-#~ msgid "Grab buildings"
-#~ msgstr "Захватить здание"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Для этой возможности нужен (по крайней мере) один спецкадастр\n"
-#~ "Слой зданий и слой данных OSM."
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Слой только для захвата зданий"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Развернуть здание по нажатию (только вектор изображения)"
-
-#~ msgid "Edit turn restriction #{0} in layer ''{1}''"
-#~ msgstr "Править ограничение на поворот #{0} в слое ''{1}''"
-
-#~ msgid "Edit new turn restriction in layer ''{0}''"
-#~ msgstr "Править новое ограничение на поворот в слое ''{0}''"
-
-#~ msgid "Create new turn restriction in layer ''{0}''"
-#~ msgstr "Создать новое ограничение на поворот в слое ''{0}''"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Вставить объект 'via' (через) из буфера обмена"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Отображает географически привязанные изображения в качестве фона в JOSM "
-#~ "(WMS серверов Yahoo, ...)."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Предупреждение:</strong> Пароль передан <strong>один раз</strong> "
-#~ "в чистом виде на вебсайт OSM. <strong>Не используйте</strong> открытый "
-#~ "пароль до тех пор, пока сервер OSM поддерживает шифрованный канал связи "
-#~ "(HTTPS)."
-
-#~ msgid "line"
-#~ msgstr "высоковольтная"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Предупреждение: модуль turnrestrictions заменяет уже существующее "
-#~ "действие ''{0}'', вызываемое горячими клавишами ''{1}'', действием ''{2}''"
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Добавить линию OSM с ролью ''from''"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Добавить линию OSM с ролью ''to''"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "Линии OSM с ролью <tt>to</tt> требуется ограничение на поворот."
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "Пожалуйста, перейдите в Основной редактор и выберите линию OSM."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr "Линии OSM с ролью <tt>from</tt> требуется ограничение на поворот."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Перейдите к Основному редактору и выберите линию OSM"
-
-#~ msgid "Splits the way"
-#~ msgstr "Разделяет линию"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Вместо этого требуется линия OSM."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Это ограничение на поворот использует отношение OSM <span class=\"object-"
-#~ "name\">{0}</span> как участника с ролью <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Это ограничение на пововрот использует линию OSM <span class=\"object-name"
-#~ "\">{0}</span> с ролью <tt>from</tt> <strong>и</strong> с ролью <tt>to</"
-#~ "tt>. В ограничении на поворот, линия с ролью <tt>from</tt> хотя бы должна "
-#~ "отличаться от линии с ролью <tt>to</tt>."
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "Линия <strong>от</strong> <span class=\"object-name\">{0}</span> и линия "
-#~ "<strong>куда</strong> <span class=\"object-name\">{1}</span> пересекаются "
-#~ "в точке <span class=\"object-name\">{2}</span>, но <span class=\"object-"
-#~ "name\">{2}</span> это не объект <strong>через</strong>.<br> Рекомендуется "
-#~ "задать <span class=\"object-name\">{2}</span>, как уникальный объект "
-#~ "<strong>через</strong>."
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "Линия OSM <span class=\"object-name\">{0}</span> с ролью <tt>{1}</tt> "
-#~ "должна быть разделена в точке <span class=\"object-name\">{2}</span>, в "
-#~ "которой она соединяется с линией <span class=\"object-name\">{3}</span>."
-
-#~ msgid "Download Object..."
-#~ msgstr "Скачать объект..."
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Загружает данные калибровки файла"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Макс. высота (в метрах)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Макс. ширина (в метрах)"
-
-#~ msgid "standard"
-#~ msgstr "стандарт"
-
-#~ msgid "Travel"
-#~ msgstr "Путешествия"
-
-#~ msgid "Edit Football"
-#~ msgstr "Свойства американского футбола"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Свойства регби"
-
-#~ msgid "minor_line"
-#~ msgstr "среднего / низкого напряжения"
-
-#~ msgid ""
-#~ "The turnrestrictions plugin allows to create and edit turn restrictions "
-#~ "in the OpenStreetMap database."
-#~ msgstr ""
-#~ "Модуль turnrestrictions позволяет создавать и редактировать ограничения "
-#~ "движения в базе данных OpenStreetMap."
-
-#~ msgid "tagged"
-#~ msgstr "помеченные тегами"
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Фильтр Спрятано: {0} Отключено: {0}"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Чтобы сохранить вашу локальную версию, JOSM<br>сбросит id элемента "
-#~ "{0} в 0.<br>При следующей загрузке, сервер назначит<br>ему новый id."
-#~ "<br>Вы согласны?</html>"
-
-#~ msgid "reverter: {0}"
-#~ msgstr "откатчик: {0}"
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Не найдена линия \"from\" (откуда)"
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Обнаружена больше чем одна линия \"from\" (откуда)"
-
-#~ msgid " Video"
-#~ msgstr " Видео"
-
-#~ msgid "autoload tiles"
-#~ msgstr "загружать квадраты карты автоматически"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Отображает решётку в \"быстрой карте\" JOSM. Вы можете загрузить квадраты "
-#~ "из \"быстрой карты\" в качестве фона и запросить обновления."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Это ограничение на поворот использует точку OSM <span class=\"object-name"
-#~ "\">{0}</span> в качестве участника с ролью <tt>{1}</tt>."
-
-#~ msgid "Motor Sports"
-#~ msgstr "Мотоспорт"
-
-#~ msgid "With kiosk"
-#~ msgstr "С киоском"
-
-#~ msgid "farmland"
-#~ msgstr "сельскохозяйственные земли"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Указан неверный ID. Невозможно загрузить объект."
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Свойства моторных видов спорта"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Добро пожаловать в</span><br>\n"
-#~ "модуль <span style=\"font-size: xx-large;\">AlignWay<span style=\"color: "
-#~ "rgb(204, 85, 0);\">S</span><br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...хотя, лучше его назвать <br>\n"
-#~ "модуль <span style=\"font-size: large;\">AlignWayS(egments)</span>...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Выравнивание сегментов.</b> Нажмите <b><i><span style=\"color:"
-#~ "green\">Shift-A</span></i></b>. Также вы можете найти команду в меню "
-#~ "<b>инструменты</b>\n"
-#~ " или можете назначить действие на <b>панель инструментов</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "Ткните в угол здания, чтобы начать рисовать"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Полученный тип {0} с id {1} имеет неправильную версию"
-
-#~ msgid "{0} covers {1}% of GPS track"
-#~ msgstr "{0} покрывает {1}% трека GPS"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "Выравнивание может вынести точки за пределы мира.\n"
-#~ "Ваше действие было отменено."
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "Невозможно выравнивать соединённые сегменты.\n"
-#~ "Пожалуйста, выберите два сегмента, которые не имеют общих точек."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Вы удаляете неполные объекты.<br>Это может привести к проблемам, потому "
-#~ "что вы не видите сам объект.<br>Вы действительно хотите его удалить?"
-
-#~ msgid "faster"
-#~ msgstr "быстрее"
-
-#~ msgid "forward"
-#~ msgstr "вперёд"
-
-#~ msgid "play/pause"
-#~ msgstr "воспр/пауза"
-
-#~ msgid "backward"
-#~ msgstr "назад"
-
-#~ msgid "slower"
-#~ msgstr "медленнее"
-
-#~ msgid "Building tag:"
-#~ msgstr "Тег здания:"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% трека GPS"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "В дочерний скрипт попали неверные данные."
-
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Создать отношение для связи номера домов с улицей"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "Не использовать отношение для адресов  (однако, \"addr:street\" на "
-#~ "элементах)."
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "Невозножно открфыть автосохранённые данные osm ({0}) - {1}"
-
-#~ msgid "Edit SeaMap Symbols"
-#~ msgstr "Редактировать символы SeaMap"
-
-#~ msgid "read protocol version"
-#~ msgstr "прочитать версию протокола"
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Редактор морских объектов Seamark Editor"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Конфликт с атрибутом 'visible' для объекта типа {0} с идентификатором {1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Объект {0} с идентификатором {1} был обозначен для изъятия, но он "
-#~ "отсутствует в первоначальном наборе данных."
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM нашел не сохраненный слой {0} с osm-данными. Они похожи на те, что "
-#~ "были перед последним сбоем JOSM. Восстановить данные?"
-
-#~ msgid "Edit OpenSeaMap"
-#~ msgstr "Редактировать OpenSeaMap"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (зеркало)"
-
-#~ msgid ""
-#~ "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to "
-#~ "grab."
-#~ msgstr "Добавить \"Tableau(x) d'assemblage\" в список слоёв для загрузки."
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Разрешить изменить отображение путевых точек"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "введите временную отсечку gps-трека"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Изменить свойства 1 объекта"
-
-#~ msgid "import data from URL"
-#~ msgstr "Импортировать данные из URL"
-
-#~ msgid "jump"
-#~ msgstr "Перейти"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Возможно в прошлый раз произошел сбой. Вы желаете восстановить эти данные?"
-
-#~ msgid "Internal style"
-#~ msgstr "Внутренний стиль"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Безымянный слой WMS"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr ""
-#~ "Выделено {0} элемента(ов). Но вы можете редактировать только один элемент!"
-
-#~ msgid "Add relation"
-#~ msgstr "Добавить отношение"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr "Масштаб слишком мелкий для сохранения точного смещения"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Выравнивание сегментов.</b> Нажите <b><i><span style=\"color:"
-#~ "green\">"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Этот слой не поддерживает ни одну проекцию JOSM,\n"
-#~ "и вы не можете его использовать. Это сообщение снова не появится."
-
-#~ msgid "Add WMS URL"
-#~ msgstr "Добавить WMS ссылку"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Запустите браузер с Вики помощью по выделенному объекту"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Доступные стили (из {0}):"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "Введите координаты новой точки.<br/>Вы можете отделить долготу и широту "
-#~ "пробелом, запятой или точкой с запятой.<br/>Используйте положительные "
-#~ "числа или символы N, E для обозначения Северного и Восточного "
-#~ "направлений. <br/> Для Юга и Запада - используйте отрицательные числа или "
-#~ "символы S, W.\r\n"
-#~ "Значения координат могут быть записаны в трех форматах:"
-#~ "<ul><li><i>градусі</i><tt>&deg;</tt></li><li><i>градусі</i><tt>&deg;</tt> "
-#~ "<i>минуты</i><tt>&#39;</tt></li><li><i>градусі</i><tt>&deg;</tt> "
-#~ "<i>минуты</i><tt>&#39;</tt> <i>секунды</i><tt>&quot</tt></li></ul>Символы "
-#~ "<tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, "
-#~ "<tt>&Prime;</tt> является дополнительными.<br/><br/>Примеры:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li><li>48&deg 42' "
-#~ "52.13\" N, 21&deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Профиль высоты для трека '"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Пожалуйста, настройте вручную положение слоев WMS по известным объектам/"
-#~ "трекам/… перед тем как начать чертить"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "Текущая проекция — {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "изменить проекцию с {0} на {1}"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "set {0}"
-#~ msgstr "установить {0}"
-
-#~ msgid "Seamarks"
-#~ msgstr "Навигационные знаки"
-
-#~ msgid "it works realy fine"
-#~ msgstr "это действительно хорошо работает"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "нанесение навигациних знаков"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Упростить область (удалить {0} точку)"
-#~ msgstr[1] "Упростить точку (удалить {0} точки)"
-#~ msgstr[2] "Упростить область (удалить {0} точек)"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "заменено на {0} модул."
-
-#~ msgid "OSM-Cert"
-#~ msgstr "OSM-Cert"
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: Проблема с удаленным управлением"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "Не удается инициализировать удаленное управление."
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "Модуль удаленного управления не совместим с {0}."
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} будет работать, но удаленное управление для этого модуля отключено.\n"
-#~ "Необходимо обновить этот модуль."
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "Текущая версия \"{1}\": {2}, внутренняя версия {3}. Необходима версия "
-#~ "{4}, внутренняя версия {5}.\n"
-#~ "Если обновление модулей не поможет, тогда отправьте отчет об ошибки для "
-#~ "\"{0}\"."
-
-#~ msgid "Remote WMS"
-#~ msgstr "Дистанционный WMS"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Позволить внешние команды (требуется модуль remotecontrol)"
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr "Remote Control запросил скачивание слоя WMS из следующего URL:"
-
-#~ msgid "Re-open bug"
-#~ msgstr "Открыть заново неисправность"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "Непонятная неисправность"
-
-#~ msgid "Close bug"
-#~ msgstr "Закрыть неисправность"
-
-#~ msgid "Add comment"
-#~ msgstr "Добавить комментарий"
-
-#~ msgid "Key Signatures"
-#~ msgstr "Подписи ключа"
-
-#~ msgid "Key certified for OSM-Usage with comment:{0}"
-#~ msgstr "Ключ, сертифицированный на использование в OSM с комментарием: {0}"
-
-#~ msgid "Privacy"
-#~ msgstr "Конфиденциальность"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "Больше не спрашивать ключ"
-
-#~ msgid "Experimental union of SlippyMap plugin and WMSPlugin"
-#~ msgstr "Экспериментальный гибрид модулей SlippyMap и WMSPlugin"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Пожалуйста, выберите как минимум две точки для объединения, либо точку, "
-#~ "расположенную близко к другой точке."
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Проекция ''{0}'' не найдена"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Миграция настроек снимков: конфликт при импорте параметра {0} -> {1}"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Миграция настроек WMSPlugin/SlippyMap"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr "Миграция настроек снимков: конфликт при импорте массива {0} -> {1}"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Список слоёв WMS"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Параметры WMSPlugin:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Параметры SlippyMap:"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Сохранить текущие параметры"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Заменить списком WMSPlugin"
-
-#~ msgid "Keep current list"
-#~ msgstr "Сохранить текущий список"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "Имеется {0} неизвестных настроек slippymap"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "Имеется {0} неизвестных настроек WMSPlugin"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Заменить параметрами SlippyMap"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Заменить параметрами WMSPlugin"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Миграция параметров Imagery"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Внимание: неожиданный конфликт настроек"
-
-#~ msgid "load imagery layers"
-#~ msgstr "загрузить слои снимков"
-
-#~ msgid "Settings for the Remote Control freature."
-#~ msgstr "Параметры функции дистанционного управления"
-
-#~ msgid ""
-#~ "JOSM will always listen on port 8111 on localhost.The port is not "
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
 #~ "configurable because it is referenced by external applications talking to "
 #~ "JOSM."
 #~ msgstr ""
-#~ "JOSM ожидает подключений к порту 8111 на localhost. Порт нельзя менять, "
-#~ "так как его номер стандартизирован и используется приложениями для "
-#~ "подключения к JOSM."
-
-#~ msgid "No colour"
-#~ msgstr "Без цвета"
-
-#~ msgid "White"
-#~ msgstr "Белый"
-
-#~ msgid "Red"
-#~ msgstr "Красный"
-
-#~ msgid "Add offset bookmark"
-#~ msgstr "Добавить смещение в закладки"
-
-#~ msgid "(save current)"
-#~ msgstr "(сохранить текущее)"
-
-#~ msgid "Violet"
-#~ msgstr "Фиолетовый"
-
-#~ msgid "Black"
-#~ msgstr "Чёрный"
-
-#~ msgid "Green"
-#~ msgstr "Зелёный"
-
-#~ msgid "Blue"
-#~ msgstr "Голубой"
-
-#~ msgid "Amber"
-#~ msgstr "Янтарный"
-
-#~ msgid "Yellow"
-#~ msgstr "Жёлтый"
-
-#~ msgid "Orange"
-#~ msgstr "Оранжевый"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "GnuPG команда для запуска:"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Левый клик: снять выделение с точки"
-
-#~ msgid "Run..."
-#~ msgstr "Выполнить..."
-
-#~ msgid "Run a script"
-#~ msgstr "Выполнить скрипт"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Левый клик: выделить точку"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "Пожалуйста, сначала укажите имя файла"
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "Файл скрипта ''{0}'' не существует"
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "Ошибка чтения скрипта из файла ''{0}''."
-
-#~ msgid "The script file ''{0}'' isn't readable."
-#~ msgstr "Не удается прочитать файл скрипта ''{0}''."
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "Введите имя файла скрипта"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "Не удалось выполнить скрипт."
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "Ошибка чтения макроса из файла ''{0}''."
-
-#~ msgid "IO error"
-#~ msgstr "Ошибка ввода/вывода"
-
-#~ msgid "Launch file selection dialog"
-#~ msgstr "Показать диалог выбора файла"
-
-#~ msgid "No scripting engine"
-#~ msgstr "Нет поддержки скриптов"
-
-#~ msgid "Select a script"
-#~ msgstr "Выбрать скрипт"
-
-#~ msgid "Script Error"
-#~ msgstr "Ошибка скрипта"
+#~ "всегда прослушивает порт 8111. Настройка параметров порта не возможна, "
+#~ "так как она зависит от внешнего приложения, к которому обращается и не "
+#~ "имеет доступ JOSM."
+
+#~ msgid "Download referrers for the the chosen relation and its members"
+#~ msgstr ""
+#~ "Скачать родительские линии/отношения для выбранного отношения и его членов"
+
+#~ msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+#~ msgstr "Будут выбраны примыкающие линии. Выделение с точек будет снято."
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Найдены подозрительные данные. Всё равно выгрузить?"
 
 #~ msgid ""
-#~ "<p>The script can''t be executed, becasue there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
+#~ "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
+#~ "tune simplification"
 #~ msgstr ""
-#~ "<p>Не удается выполнить скрипт, так как не установлена поддержка скриптов."
-#~ "</p><p>Обратитесь к разделу онлайн-справки для информации, как установить "
-#~ "поддержку скриптов в JOSM.</p>"
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "Не удалось выполнить макрос."
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Scripts"
-#~ msgstr "Скрипты"
-
-#~ msgid "Language:"
-#~ msgstr "Язык:"
-
-#~ msgid "Version:"
-#~ msgstr "Версия:"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Оптимальный масштаб: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Текущий масштаб: {0}"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "Объединить контур области с контуром другой области"
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "''{0}'' не существует."
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "''{0}'' является каталогом. Укажите jar - файл."
-
-#~ msgid "remove entry"
-#~ msgstr "Удалить"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "добавить адрес нового поставщика wms/tms"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "Позволяет запускать скрипты в JOSM."
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "Объединяет контуры двух областей"
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "Встроеный стиль, внутренний путь:"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Отображаемый масштаб: {0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Увеличение пиксела: {0}"
-
-#~ msgid "Internal Style"
-#~ msgstr "Встроеный стиль"
-
-#~ msgid "Contour Merge"
-#~ msgstr "Объединить контуры"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr "Захватите сегмент исходной линии и сбросьте его на целевой сегмент"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr "Захватите сегмент исходной линии и сбросьте его на целевой сегмент"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "Сбросьте для выравнивания на целевой сегмент"
-
-#~ msgid "Left-Click: on node to select/unselect; Drag: drag way slice"
-#~ msgstr "Левый клик: на точке для выбора; Тащить: тащить отрезок линии"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Объединение контура"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "Не могу выбрать изолированную точку"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr "Выберите файл скрипта и нажмите <strong>Запустить</strong>."
-
-#~ msgid "File:"
-#~ msgstr "Файл:"
-
-#~ msgid "Run"
-#~ msgstr "Запустить"
-
-#~ msgid "Run the script"
-#~ msgstr "Запустить скрипт"
-
-#~ msgid "Empty file name"
-#~ msgstr "Пустое имя файла"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "Файл скрипта \"{0}\" не открывается на чтение"
-
-#~ msgid "File not readable"
-#~ msgstr "Не удаётся прочитать файл"
+#~ "Нажмите Enter для упрощения или сохранения, Ctrl-Enter для сохранения с "
+#~ "тегами, Вверх/Вниз для настройки упрощения"
+
+#~ msgid "unkown"
+#~ msgstr "неизвестный"
+
+#~ msgid "Global settings"
+#~ msgstr "Общие настройки"
+
+#~ msgid "GraphView default node"
+#~ msgstr "Точка GraphView по умолчанию"
+
+#~ msgid "Graphview default segment"
+#~ msgstr "Сегмент GraphView по умолчанию"
 
 #~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
+#~ "Surface values must not contain any of the following characters: '','', "
+#~ "'''{''',  '''}''', ''='', ''|''"
 #~ msgstr ""
-#~ "<p>Скрипт не может быть выполнен, т.к. отсутствуют установленые модули "
-#~ "поддержки скриптов.</p><p>Обратитесь к справочной системе для информации "
-#~ "о том, как установить необходимые модули поддержки скриптов для JOSM.</p>"
-
-#~ msgid "No script engine"
-#~ msgstr "Нет модуля поддержки скриптов"
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr "Предупреждение: не получилось загрузить mime-типы из файла \"{0}\""
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
+#~ "Значения покрытия не должны содержать следующие символы: '','', '''{''',  "
+#~ "'''}''', ''='', ''|''"
+
+#~ msgid "Transfer to password manager and remove from prefence file"
+#~ msgstr "Перенести в менеджер паролей и удалить из файла настроек"
+
+#~ msgid "Wxternal ruleset directory:"
+#~ msgstr "Внешний каталог набора правил:"
+
+#~ msgid ""
+#~ "Depending on your Operating Stystem / Distribution, you may have to "
+#~ "create a default keyring / wallet first."
 #~ msgstr ""
-#~ "Предупреждение: не получилось загрузить mime-типы по умолчанию из файла "
-#~ "ресурсов \"{0}\""
-
-#~ msgid "Please select a scripting engine to execute the selected script."
+#~ "В зависимости от вашего дистрибутива/операционной системы, вы можете "
+#~ "создать брелок по умолчанию / бумажник в первую очередь."
+
+#~ msgid ""
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Пожалуйста, выберите модуль поддержки скриптов для запуска выбраного "
-#~ "скрипта"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "Использовать выбраный модуль поддержки скриптов"
-
-#~ msgid "cancel"
-#~ msgstr "Отменить"
-
-#~ msgid "Scripting"
-#~ msgstr "Скрипты"
-
-#~ msgid "Configure..."
-#~ msgstr "Настройка..."
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "Настроить параметры выполнения скриптов"
-
-#~ msgid "Script engines"
-#~ msgstr "Модули поддержки скриптов"
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "Настройки выполнения скриптов"
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
+#~ "Список объединённых элементов. Они заменят Мои элементы, когда решение об "
+#~ "объединении будет принято."
+
+#~ msgid ""
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "''{0}'' не открывается на чтение. Не могу загрузить модуль поддержки "
-#~ "скриптов из этого файла."
+#~ "Предупреждение: Исключение проигнорировано, потому что задача отменена. "
+#~ "Ошибка: {0}"
 
 #~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Не получилось открыть файл ''{0}'' как jar-файл. Не могу загрузить модуль "
-#~ "поддержки скриптов из этого файла."
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr ""
-#~ "Jar-файл ''{0}'' не содержит модуля поддержки скриптов. Отсутствует файл "
-#~ "\"{1}\"."
-
-#~ msgid "JAR files"
-#~ msgstr "JAR-файлы"
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr "Укажите дополнительные JAR-файлы с модулями поддержки скриптов"
-
-#~ msgid "Available script engines"
-#~ msgstr "Доступные модули поддержки скриптов"
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM сейчас поддерживает следующие модули скриптов:"
-
-#~ msgid "JAR file"
-#~ msgstr "JAR-файл"
-
-#~ msgid "Remove the selected jar files"
-#~ msgstr "Удалить выбранные jar-файлы"
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "Добавить jar-файл с модулем поддержки скриптов"
-
-#~ msgid "Launch file chooser"
-#~ msgstr "Выбрать файл"
-
-#~ msgid "Select a jar file"
-#~ msgstr "Выбор jar-файла"
-
-#~ msgid "{1} (with engine {0})"
-#~ msgstr "{1} (с модулем {0})"
-
-#~ msgid "Language version:"
-#~ msgstr "Версия языка:"
-
-#~ msgid "MIME-Types:"
-#~ msgstr "MIME-типы:"
-
-#~ msgid "parking_lot"
-#~ msgstr "на парковке"
-
-#~ msgid "lane"
-#~ msgstr "на проезжей части"
-
-#~ msgid "sidewalk"
-#~ msgstr "на тротуаре"
-
-#~ msgid "Number of {0]-ways junctions found: "
-#~ msgstr "Несколько {0}-путевых соединений найдено: "
-
-#~ msgid "Opens advanced relation/multipolygon editor panel"
-#~ msgstr "Открыть расширеный редактор отношений/мультиполигонов"
-
-#~ msgid "Open Relation Editor"
-#~ msgstr "Открыть редактор отношений"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful( don't destray valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Это результаты автоматической проверки. Попробуйте исправить ошибки, но "
-#~ "будьте осторожны (не повредите правильные данные). Если сомневаетесь, "
-#~ "лучше проигнорируйте их.<br>Если вы отмените этот диалог, вы сможете "
-#~ "найти и исправить эти ошибки позже в боковой панели \"Ошибки при проверке"
-#~ "\"."
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Ниже приведены результаты автоматической проверки. Пропытайтесь их "
-#~ "исправить, но будьте осторожны (не сломайте корректные данные). Если "
-#~ "сомневаетесь, игнорируйте их.<br>Если вы отмените этот диалог, вы сможете "
-#~ "найти эти записи в боковой панели валидатора."
-
-#~ msgid "Analyzing"
-#~ msgstr "Анализ"
-
-#~ msgid "Loading from Quick History Service"
-#~ msgstr "Загрузка из Quick History Service"
-
-#~ msgid "Makes a paralell copy of the selected way(s)"
-#~ msgstr "Создание параллельной копии выделенного пути(ей)"
-
-#~ msgid "Eps={0}"
-#~ msgstr "Eps={0}"
-
-#~ msgid " {0} nodes; "
-#~ msgstr " {0} точек; "
-
-#~ msgid ""
-#~ "Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}, Version: "
-#~ "{4}"
-#~ msgstr ""
-#~ "Набор данных: {0}; Пользователь: [{1}]; ID пакета правок: {2}; Метка "
-#~ "времени: {3}, Версия: {4}"
-
-#~ msgid " {0} members; "
-#~ msgstr " {0} участников; "
-
-#~ msgid "Can't parse a time from this string."
-#~ msgstr "Невозможно разобрать время из этой последовательности."
-
-#~ msgid ""
-#~ "The GPX file doesn't contain valid trackpoints. Please use a GPX file "
-#~ "that has trackpoints."
-#~ msgstr ""
-#~ "GPX файл не содержит действительных маршрутных точек. Пожалуйста, "
-#~ "используйте GPX файл, который имеет маршрутные точки."
-
-#~ msgid "Eps={0}, {1} points"
-#~ msgstr "Eps={0}, {1} точек"
-
-#~ msgid "Couldn't find built-in ruleset {0}"
-#~ msgstr "Не удалось найти встроенный набор правил {0}"
-
-#~ msgid ""
-#~ "Lengths must be given as positive decimal numbers with unit \"m\", \"km"
-#~ "\", \"mi\" or without unit.\n"
-#~ "Alternatively, the format FEET' INCHES\" can be used."
-#~ msgstr ""
-#~ "Длина должна быть задана положительными числами с единицей измерения \"m"
-#~ "\", \"km\", \"mi\" или без неё.\n"
-#~ "Кроме того, может быть использован формат ФУТЫ' ДЮЙМЫ\" (2' 7\")."
-
-#~ msgid "license validation warning"
-#~ msgstr "предупреждение о проверке лицензии"
-
-#~ msgid "license validation error"
-#~ msgstr "ошибка проверки лицензии"
+#~ "Предупреждение: игнорирование исключения, потому что задание было "
+#~ "отменено. Текст ошибки: {0}"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Позволяет отфильтровать не нужные GPS треки"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 26529)
+++ applications/editors/josm/i18n/po/sk.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 16:05+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:45+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:41+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Nápoveda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorujem poškodený súbor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Upozornenie"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" neakceptuje  názov súboru, alebo URL súboru"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorujem nesprávnu URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "staršie (Java 5 kompatibilnú) verziu JOSM.</li></ul> Viac informácií:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Ukončiť JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Pokračovať, pokúsiť sa znovu"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -389,6 +390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -415,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -421,7 +422,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -429,5 +431,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -638,5 +640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -886,5 +888,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -893,5 +895,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1072,6 +1074,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1222,5 +1224,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1451,6 +1453,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2126,5 +2128,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2451,7 +2453,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Sťahujem dáta"
@@ -2707,6 +2709,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2852,10 +2854,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3020,5 +3022,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3618,5 +3620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3668,40 +3670,40 @@
 msgstr "Zmenené body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Presunúť \"{0}\" pre bod ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Presunúť \"{0}\" pre cestu ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Remove \"{0}\" for reláciu ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Nastavenie {0}={1} pre bod ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Nastavenie {0}={1} pre cestu ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Nastavenie {0}={1} pre reláciu ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Odstrániť \"{0}\" pre {1} objektov"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3833,4 +3835,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Odstrániť potvrdenie"
@@ -4153,9 +4156,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Varovanie: Neúspešná inicializácia preferencií. Neúspešné resetovanie "
-"preferencií do východzích: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4191,8 +4192,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Varovanie: neočakávané číslo verzie JOSM v opravnom(revision) súbore, "
-"hodnota je ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4297,10 +4296,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM očakáva vyhľadať pôvodné [{0} {1}] v dátovej sade, ale nenachádza sa "
-"tam. Prosím pošlite správu na http://josm.openstreetmap.de . Toto nie je "
-"kritická chyba, mali by ste bezpečne pokračovať vo vašej práci."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4404,5 +4400,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4422,8 +4418,8 @@
 msgstr "multipolygón"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4565,52 +4561,64 @@
 msgstr "WGS84 Zemepisné"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Varovanie: neúspešné otvorenie vstupného toku zdroja ''/data/{0}''. Nemôžem "
-"načítať NTF<->RGF93 mriežku"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (Francúzko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} do {2} stupňov)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Corsica)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Lambert CC Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (Francúzko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estónsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercatorova projekcia"
@@ -4638,81 +4646,101 @@
 "zodpovedala kódu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Poľsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poľsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Poľsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Švajčiarsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Lotyšsko TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Sever"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Juh"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Pologuľa(hemisféra)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Offset 3.000.000 východne"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM France (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM Geodesic system"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4938,45 +4966,45 @@
 msgstr "Tento test kontroluje, či sú platné multipolygóny"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Oblasť štýlu cesty nie je uzavretá"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Chýba vonkajšia cesta multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Žiadny štýl pre multipolygón"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Nie je žiaden štýl v multipolygónovej relácii"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Štýl pre vnútornú cestu multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Štýl pre vonkajšiu cestu multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygón nie je uzavretý"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Vnútorná cesta multipolygónu je vonku"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Priesečník medzi cestami multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Žiadna platná funkcia pre člena multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Multipolygón neobsahuje žiadnu cestu"
@@ -5249,5 +5277,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5272,5 +5300,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5281,5 +5309,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5691,5 +5719,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5757,5 +5785,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "komunikácie"
@@ -5763,5 +5791,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5769,10 +5797,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vodný tok"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "využitie oblasti (landuse)"
@@ -5782,5 +5810,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5795,5 +5823,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5807,5 +5835,5 @@
 msgstr "hromadná doprava"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6173,5 +6201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6282,4 +6310,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6385,5 +6414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6428,11 +6457,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Okrem iného môžete vložiť <strong>adresu dlaždíc</strong> pre "
-"jednotlivé dlaždice vo formáte<i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
-"Adresa dlaždíc vo formáte <i>zoom,x,y</i> alebo <i>zoom;x;y</i> sú tiež "
-"platné.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6726,9 +6751,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Zoznam spojovaných elementov. Budú nahradené mojimi elementmi, keď "
-"rozhodnutie pre spojenie bude aplikované"
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6977,10 +7000,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Ponechaj moje súradnice"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Ponechaj ich súradnice"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7037,6 +7060,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7058,6 +7081,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7467,5 +7490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7714,5 +7737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7926,7 +7949,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "neznámy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8190,5 +8243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8208,5 +8261,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8223,5 +8276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Stiahnuť neúplných členov vybratých relácií"
@@ -8229,5 +8282,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Stiahnuť neúplných členov"
@@ -8270,5 +8323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8276,5 +8329,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8476,5 +8529,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8578,5 +8631,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Užívateľ"
@@ -9577,5 +9629,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9757,5 +9809,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9910,4 +9962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Iba moje zmenové súbory"
@@ -9921,4 +9974,10 @@
 msgstr ""
 "Iba zmenové súbory vyhotovené užívateľom s nasledujúcim menom užívateľa"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10213,9 +10272,9 @@
 msgstr "Táto požiadavka URL na zmenové súbory je chybná"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10225,13 +10284,13 @@
 msgstr[2] "Toto chce zmeniť {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Prázdna hodnota vymaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10244,18 +10303,19 @@
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Zmeniť hodnoty ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Nahradiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10264,5 +10324,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10273,5 +10333,5 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10281,27 +10341,31 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10310,62 +10374,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Poloha"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Prejsť na OSM wiki pre pomoc s tagmi (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Spustiť prehliadač s wiki nápovedu pre vybraný objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Vybrať reláciu v hlavnom výbere."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10432,9 +10496,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10457,11 +10523,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
-"Sťahovanie {0} neúplného dieťaťa(child) z {1} rodičovských relácií ''{1}''"
 msgstr[1] ""
-"Sťahovanie {0} neúplných detí(child) z {1} rodičovských relácií ''{1}''"
-msgstr[2] ""
-"Sťahovanie {0} neúplných detí(child) z {1} rodičovských relácií ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10813,9 +10875,4 @@
 msgstr "Boli tam {0} konflikty počas importu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10856,11 +10913,4 @@
 msgid "Load relation"
 msgstr "Načítať reláciu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Varovanie: ignorujem výnimku, pretože úloha bola zrušená. Výnimka bola: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11143,37 +11193,4 @@
 msgstr "Typ"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "neznámy"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11298,20 +11315,20 @@
 msgstr "Súradnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "História pre bod {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "História pre cestu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "História pre reláciu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Načítať históriu zo serveru"
@@ -11405,6 +11422,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Zmenový súbor"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12010,17 +12027,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Nahrávanie /alebo ukladacia operácia z jednej vrstvy s "
-"úpravami<br>bola zrušená alebo skončila neúspechom.</html>"
 msgstr[1] ""
-"<html>Nahrávanie /alebo ukladacie operácie z {0} vrstiev s úpravami<br>boli "
-"zrušené alebo skončili neúspechom.</html>"
-msgstr[2] ""
-"<html>Nahrávanie /alebo ukladacie operácie z {0} vrstiev s úpravami<br>boli "
-"zrušené alebo skončili neúspechom.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12469,4 +12479,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12497,13 +12508,4 @@
 "<html>Nemôžem nahrať {0} objektov v jednej požiadavke pretože<br>max. "
 "veľkosť zmenového súboru {1} na server ''{2}'' je prekročená.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Sú tam <strong>viacnásobné zmenové súbory</strong> je potrebné určiť "
-"poradie pre nahratie {0} objektov. Ktorú stratégiu chcete použiť?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12585,38 +12587,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Prispôsobiť farbu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Predvolené"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Zvoľte farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Meno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12628,9 +12630,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12638,26 +12640,26 @@
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Dĺžka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12667,8 +12669,8 @@
 msgstr[2] "{0} trás, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12678,12 +12680,12 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps poloha bodu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12693,10 +12695,10 @@
 msgstr[2] "{0} stôp(track), "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12706,78 +12708,78 @@
 "závadné.<br>Ak chcete nahrať stopy, pozrite sem:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Stiahnuť okolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "iba stopy(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "iba waypointy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "stopy a waypointy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12788,11 +12790,11 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12802,6 +12804,6 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12811,27 +12813,27 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Značky z pomenovaných bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pomenovanie trackpoints od {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importovať zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12843,29 +12845,29 @@
 "cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Import nie je možný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosúbory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Zukové značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importovať obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12973,5 +12975,5 @@
 msgstr "Bol najdený nasledujúci problém:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12981,57 +12983,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Ukázať Info Dlaždíc"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Priblíženie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Oddialiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Snímka na veľkosť dlaždice"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "zvýšiť úroveň zväčšenia pre viditeľnosť viacej detailov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13584,10 +13594,10 @@
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13596,5 +13606,5 @@
 msgstr[2] "značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13604,5 +13614,5 @@
 msgstr[2] "{0} pozostáva z {1} značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -13610,17 +13620,17 @@
 "posunutie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Zobraziť Text / Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Prepínač zobrazovania značiek textu a ikon."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synchronizovať audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13629,5 +13639,5 @@
 "synchronizácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13635,14 +13645,14 @@
 msgstr "Zvuk zosynchronizovaný na bode {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Nie je možné synchronizovať v už prehrávanej vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Vytvoriť Zvukovú značku v \"Play Head\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13671,13 +13681,13 @@
 msgstr "Nie je možné vytvoriť novú zvukovú značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Bola tam nejaká chyba zatiaľ čo skúšate zobraziť URL pre tieto značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL bolo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Chyba zobrazovania URL"
@@ -14717,63 +14727,63 @@
 msgstr "Farby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Kresliť šípky v smere jazdy"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Iba na začiatku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Vykresliť segmenty s poradovými číslami"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykresliť ohraničujúci box stiahnutých dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykresľovať virtuálne body v mode výberu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhladené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Kresliť smer cestného segmentu"
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -14781,19 +14791,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovať hranice dát stiahnutých zo servera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovať neaktívne vrstvy dát inou farbou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14801,15 +14811,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Automaticky"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Názov"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Desc(ription(popis))"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Žiadny"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14820,47 +14866,39 @@
 msgstr "Všetko"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Miestne súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Žiadny"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Zosilniť líniu, ak žiadne segmenty nie su naimportované."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Kresliť väčšie GPS body"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "Kresliť kruh z HDOP hodnoty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rýchlosť (červená = pomaly, zelená = rýchlo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
@@ -14868,5 +14906,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14890,5 +14928,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14931,5 +14969,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14943,38 +14981,18 @@
 msgstr "Pešo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Vytvorenie markerov pri čítaní GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Rýchle vykresľovanie (vypadá nepekne)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Automaticky"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Názov"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Desc(ription(popis))"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Oba"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14984,10 +15002,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Kresliť čiary medzi raw GPS bodmi"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14997,10 +15015,10 @@
 "''-1'' pre kresbu všetkých čiar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Maximálna dĺžka pre lokálne súbory (v metroch)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15009,10 +15027,10 @@
 "kreslenie všetkých línií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximálna dĺžka (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -15021,10 +15039,10 @@
 "čiarach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15033,5 +15051,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15039,14 +15057,14 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimálna vzdialenosť (pixelov)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15056,13 +15074,13 @@
 "v  manažéri vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15072,10 +15090,10 @@
 "pre digitalizáciu musia zaznamenať informácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -15083,18 +15101,36 @@
 "rýchlostí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Farebná trať a body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Značenie bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15788,5 +15824,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15878,5 +15914,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Vynulovať (Reset)"
@@ -16170,6 +16206,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Vždy aktualizovať bez opýtania"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16595,5 +16631,5 @@
 msgstr "Nová relácia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16622,9 +16658,9 @@
 msgstr "Hľadať prednastavenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Zobraziť iba použiteľné pre výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Hľadať v značkách"
@@ -16924,9 +16960,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Nastala chyba pri rozkladaní gpx súboru {0}. Iba časť súboru bude k "
-"dispozícii"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17259,7 +17293,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"Prológ dokumentu OsmChange ešte nebol napísaný. Najskôr ho prosím napíšte."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17487,9 +17520,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17897,4 +17928,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Uložiť meno a heslo (nešifrovane)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -18820,4 +18856,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18954,4 +18992,18 @@
 msgstr "Nepodarilo sa načítať XML schémy."
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19531,5 +19583,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35873,4 +35925,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35887,6 +35940,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35905,15 +35958,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "skrátené meno ulice"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "značka (tag) jednosmerky (oneway) na bode"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "značka (tag) mosta (bridge) na bode"
@@ -35924,12 +35977,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "chybná značka (tag) komunikácie na bode"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Nepomenovaná nezaradená(unclassified) hlavná cesta(highway)"
@@ -35938,16 +35991,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "komunikácia bez označenia (ref)"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "dočasný typ komunikácie"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "preklep v mene kľúča (key)"
@@ -35957,10 +36010,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "cesta pre bicykle so značkou bicykla"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "cesta pre peších so značkou"
@@ -35969,10 +36022,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "oddelené jazdné pruhy na ceste pre cyklistov"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "prekážka na ceste"
@@ -35981,35 +36034,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "maximálna rýchlosť na ceste pre peších"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "značka vrstvy so značkou +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "meno ulice obsahuje ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relácia bez type"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "reštaurácia bez mena"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "neobvyklá kombinácia značiek (tagov)"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36114,117 +36176,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Czech CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Czech UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT Japan (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT Japan (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT Japan (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT Japan (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Lodi - Italy"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -36475,6 +36547,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Nahrávanie je zrušené"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36576,9 +36648,9 @@
 msgstr "(Žiadne údaje o nadmorskej výške)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -36596,23 +36668,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36620,26 +36722,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Informácia o pluginoch"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36647,5 +36777,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -36756,9 +36886,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36857,17 +36987,34 @@
 msgstr "Vyberie všetky adresy s neúplnými údajmi."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Vlastnosti vrstvy"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Import obrázku"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Import georeferenčného obrázka"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Chyba pri vytváraní obrazu vrstvy: "
@@ -37514,31 +37661,35 @@
 msgstr "Vybrať hranice obce(samosprávy)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Plugin cadastre-fr používa tradične pre grabovanie klávesovú skratku F11\n"
-"ktorá je práve štandardne pridelená pre vypínač full-screen\n"
-"Budete si želať obnoviť F11 pre grabovanie?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Obnoviť klávesovú skratku pre grabovanie F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -37664,9 +37815,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Nahradiť pôvodné biele pozadie, farbou pozadia definovanou v nastaveniach "
-"JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38587,5 +38736,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38595,17 +38744,17 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
@@ -38757,5 +38906,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38763,10 +38912,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38775,5 +38924,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38782,6 +38931,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38790,9 +38939,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38951,71 +39100,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39023,32 +39180,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -39083,6 +39234,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -39213,30 +39364,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39935,5 +40099,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39950,5 +40114,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -40687,17 +40851,17 @@
 msgstr "Nová obrázková vrstva zo schránky"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Nová obrázková vrstva zo súboru ..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Nepodarilo sa nájsť objekt na mape."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -40711,36 +40875,32 @@
 msgstr "V schránke nie je obrázok"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -41362,5 +41522,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -42331,4 +42491,21 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:777
 msgid "Create a new signing key"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
 msgstr ""
 
@@ -42565,15 +42742,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
-"Tento zákaz odbočenia sa vzťahuje na objekt, ktorý bol vymazaný mimo tohto "
-"editora zákazu odbočenia:"
 msgstr[1] ""
-"Tieto zákazy odbočenia sa vzťahujú na {0} ktoré boli vymazané mimo tohto "
-"editora zákazu odbočenia:"
-msgstr[2] ""
-"Tieto zákazy odbočenia sa vzťahujú na {0} ktoré boli vymazané mimo tohto "
-"editora zákazu odbočenia:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -42833,6 +43003,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Otvoriť editor pre vybrané zákazy odbočenia"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43429,5 +43599,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -43826,4946 +43996,89 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Presunúť"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Prosím najskôr zadajte požadované koordináty."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Zatiaľ nie je implementované."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Downloading..."
-#~ msgstr "Sťahujem ..."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Odstrániť vybranú vrstvu."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyriešiť konflikty"
-
-#~ msgid "my version:"
-#~ msgstr "moja verzia:"
-
-#~ msgid "Unknown version"
-#~ msgstr "Neznáma verzia"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Pripravujem dáta..."
-
-#~ msgid "Aborting..."
-#~ msgstr "Prerušujem..."
-
-#~ msgid "to"
-#~ msgstr "do"
-
-#~ msgid "Change"
-#~ msgstr "Zmeniť"
-
-#~ msgid "No data imported."
-#~ msgstr "Neboli importované žiadne dáta."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Chyba pri načítaní stránky {0}"
-
-#~ msgid "Create a new map."
-#~ msgstr "Vytvoriť novú mapu"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nesprávne heslo alebo meno."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
+#~ msgid "Change values?"
+#~ msgstr "Zmeniť hodnoty ?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "neobvyklá kombinácia značiek (tagov)"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Nahrávanie je zrušené"
 
 #~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Upozornenie - bolo požadované nahratie pluginu {0}. Tento plugin už nie "
-#~ "je potrebný."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin nenájdený: {0}."
-
-#~ msgid "Enter Password"
-#~ msgstr "Zadajte heslo"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neuložené zmeny"
-
-#~ msgid "x from"
-#~ msgstr "x od"
-
-#~ msgid "y from"
-#~ msgstr "y od"
-
-#~ msgid "Do not show again"
-#~ msgstr "Nezobrazovať v budúcnosti"
+#~ "Nahradiť pôvodné biele pozadie, farbou pozadia definovanou v nastaveniach "
+#~ "JOSM."
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "Skúste aktualizovať na najnovšiu verziu tohoto doplnku (pluginu) pred "
-#~ "hlásením chyby."
+#~ "Zoznam spojovaných elementov. Budú nahradené mojimi elementmi, keď "
+#~ "rozhodnutie pre spojenie bude aplikované"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Ponechaj moje súradnice"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Ponechaj ich súradnice"
 
 #~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Nemôžem sa pripojiť k OSM serveru. Prosím skontrolujte si pripojenie k "
-#~ "internetu."
-
-#~ msgid "Error during parse."
-#~ msgstr "Chyba v priebehu parsovania"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Nájdený element <nd> mimo cesty."
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Chýba povinný atribút \"{0}\"."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n"
+#~ "Plugin cadastre-fr používa tradične pre grabovanie klávesovú skratku F11\n"
+#~ "ktorá je práve štandardne pridelená pre vypínač full-screen\n"
+#~ "Budete si želať obnoviť F11 pre grabovanie?"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Server vrátil vnútornú chybu. Skúste to za chvíľu znovu alebo skúste "
-#~ "zmenšiť oblasť."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> má nulový ref"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Neplatný objekt s id=0"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
-
-#~ msgid "Commit comment"
-#~ msgstr "Poslať komentár"
-
-#~ msgid "Preparing..."
-#~ msgstr "Pripravujem..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Nahrávam..."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Najskôr zvoľte záložku"
-
-#~ msgid "Download Area"
-#~ msgstr "Stiahnuť plochu"
-
-#~ msgid "zoom level"
-#~ msgstr "Úroveň zväčšenia"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Zdroje a typy dát"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
+
+#~ msgid ""
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Upraviť novú reláciu"
-
-#~ msgid "Create new relation"
-#~ msgstr "Vytvoriť novú reláciu"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Upraviť reláciu #{0}"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Upraviť vlastnosti"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Pridať všetky zvolené objekty medzi členy"
-
-#~ msgid "Add Selected"
-#~ msgstr "Pridať vybrané"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nemôžem sa pripojiť na server."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Chyba parsovania odozvy servera"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Vznikli konflikty počas importu"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Členov: {0}"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Kľuknite na obnoviť pre aktualizáciu zoznamu"
+#~ "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Vrátiť stav všetkých vybratých objektov na verziu vybratú zo zoznamu "
-#~ "histórie."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Sú tu neuložené zmeny. Napriek tomu zmazať vrstvu?"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Spojiť vrstvy pod označenou"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Zobraziť/Skryť Text/Ikony"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Naozaj chcete zmazať celú vrstvu?"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Vrstvy: {0}"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Zobraz informáce o histórii ciest a bodov v OSM"
-
-#~ msgid "History of Element"
-#~ msgstr "História Elementu"
-
-#~ msgid "Uploading data"
-#~ msgstr "Nahrávam dáta"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť."
+#~ "Varovanie: Neúspešná inicializácia preferencií. Neúspešné resetovanie "
+#~ "preferencií do východzích: {0}"
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznáma prípona súboru"
-
-#~ msgid "Could not back up file."
-#~ msgstr "Nemôžem zálohovať súbor."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Otvoriť globálne nastavenie"
-
-#~ msgid "gps track description"
-#~ msgstr "popis gps trasy"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Nemôžem premenovať súbor \"{0}."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Predchádzajúca značka"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Prehrajte predchádzajúcu značku"
-
-#~ msgid "Next Marker"
-#~ msgstr "Ďalšia značka"
-
-#~ msgid "Play next marker."
-#~ msgstr "Prehrajte nasledujúcu značku"
-
-#~ msgid "Jump forward"
-#~ msgstr "Skok vpred"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Spomalené prehrávanie"
-
-#~ msgid "Load Selection"
-#~ msgstr "Nahrať výber"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakt {0}..."
-
-#~ msgid "Faster Forward"
-#~ msgstr "Rýchle prehrávanie"
-
-#~ msgid "Jump back."
-#~ msgstr "Skok späť"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Zadajte hladaný reťazec."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Chýbajúci argument pre \"NOT\""
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Očakávam uzatváraciu zátvorku."
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Chyba parsovania v URL:\"{0}\""
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Nemôžem čítať z URL:\"{0}\""
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objekt s pridaným ID"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - objekt s pridanými číslami bodov"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Výber sa musí skladať iba z ciest"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Povolené iba dva body"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vybratý iba jeden bod"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Nápovedu môžete upravovať iba z online nápovedy JOSM"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otvoriť v prehliadači"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Nápoveda"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Použite desatinné stupne."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Nemôžem prečítať záložky."
-
-#~ msgid "File not found"
-#~ msgstr "Súbor nebol nájdený"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Nemôžem zapísať do záložiek."
-
-#~ msgid "Set the language."
-#~ msgstr "Nastaviť jazyk."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Otvoriť súbor (as raw gps, if .gpx)"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Nemôžem otvoríť adresár s nastavením: {0}"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Namiesto --download=<bbox> môžete zadať osm://<bbox>\n"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktivujem aktualizované pluginy"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Aktivácia aktualizovaných pluginov zlyhala. Zkontrolujte, či máte práva k "
-#~ "ich prepísaniu."
-
-#~ msgid "layer not in list."
-#~ msgstr "vrstva nie je v zozname"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Súbor s nastaveniami má chyby. Vytváram zálohu starého do {0}."
-
-#~ msgid "Length: "
-#~ msgstr "Dĺžka: "
-
-#~ msgid "Timespan: "
-#~ msgstr "Časové rozpätie: "
-
-#~ msgid "name"
-#~ msgstr "meno"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "stopa s {0} bodmi"
-#~ msgstr[1] "stopy s {0} bodmi"
-#~ msgstr[2] "stopy s {0} bodmi"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "bod"
-#~ msgstr[1] "body"
-#~ msgstr[2] "bodov"
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} zmazané.)"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Štart GPS: {0}"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} bod"
-#~ msgstr[1] "{0} body"
-#~ msgstr[2] "{0} bodov"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} skladá sa z {1} stopy"
-#~ msgstr[1] "{0} skladá sa z {1} stôp"
-#~ msgstr[2] "{0} skladá sa z {1} stôp"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Žiadny čas pre bod {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Obrázky pre {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Čítať GPX..."
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "súčastná odchylka: {0}s"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "obrázok"
-#~ msgstr[1] "obrázky"
-#~ msgstr[2] "obrázkov"
-
-#~ msgid "timezone difference: "
-#~ msgstr "rozdiel časových pásiem: "
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} vo vnútry stopy (track)."
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchronizovať hodiny"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Koniec GPS: {0}"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Zadaný čas nemôže byť rozparsovaný"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Maximálna dĺžka (v metroch) pre vykresľovanie línií. Nastavte na '-1' pre "
-#~ "kreslenie všetkých línií."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Ďakujem za Vaše porozumenie</p>"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Prihlasovacie meno (email) k OSM účtu."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo "
-#~ "ukladať."
-
-#~ msgid "Download List"
-#~ msgstr "Stiahnuť zoznam"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Nenájdené informácie o plugine"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Konfigurovať zariadenie..."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM heslo"
-
-#~ msgid "Base Server URL"
-#~ msgstr "Základná Serverová URL"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Chyba pri mazaní súboru pluginu: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin už existuje"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Všetky nainštalované pluginy sú aktuálne."
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Verzie {1}{2}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Stiahnuť chýbajúca pluginy"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Stiahnuť nasledujúce pluginy?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Chyba čítania súboru informací o plugine: {0}"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Povoliť vstavané východzie hodnoty"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Ponechávať záložné súbory"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Adresa proxy servera"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Nastavenia proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonymný"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Používať proxy server"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Port proxy servera"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Užívatelské meno pre proxy"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Heslo pre proxy"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Nastali problémy s nasledujúcimi pluginmi:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Nemôžem stiahnuť plugin: {0} z {1}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Spojenie konfliktov"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikty: {0}"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Značky (prázdne hodnoty zmazaných značiek)"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Príkazový Stĺpik: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Obnoviť obsah výberu."
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Prázdna hodnota zmaže klúče"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt je v konflikte:"
-#~ msgstr[1] "{0} objekty sú v konflikte:"
-#~ msgstr[2] "{0} objektov je v konflikte:"
-
-#~ msgid "their version:"
-#~ msgstr "verzia na servery:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finálna verzia:"
-
-#~ msgid "osmarender options"
-#~ msgstr "možnosti pre osmarender"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importovať TCX súbor ako GPS trasu"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importovať TCX súbor..."
-
-#~ msgid "Request Update"
-#~ msgstr "Žiadosť na aktualizáciu"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Zobraziť Stav Dlaždíc"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Zdroje Dlaždíc"
-
-#~ msgid "requested: {0}"
-#~ msgstr "požadovaný: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "chyba požadovanej aktualizácie"
-
-#~ msgid "error loading metadata"
-#~ msgstr "chyba pri zavádzaní metadát"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Nastavenie WMS Pluginu"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Zadajte meno v menu a WMS URL"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Copy Default"
-#~ msgstr "Skopírovať východzí"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL (východzie)"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Vyberte riadok na kopírovanie."
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Sťahovať Prekreslený Obrázok z Metacarta's Map Rectifier WMS"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Sťahovať WMS dlaždice z {0}"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Nápoveda WMS Pluginu"
-
-#~ msgid "help"
-#~ msgstr "nápoveda"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigácia"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Upraviť pozíciu WMS vrstvy"
-
-#~ 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] "Výber obsahuje {0} cestu. Naozaj ju chcete zjednodušiť?"
-#~ msgstr[1] "Výber obsahuje {0} cesty. Naozaj ich chcete zjednodušiť?"
-#~ msgstr[2] "Výber obsahuje {0} ciest. Naozaj ich chcete zjednodušiť?"
-
-#~ msgid "start"
-#~ msgstr "začiatok (start)"
-
-#~ msgid "end"
-#~ msgstr "koniec (end)"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Duplikovaná skratka na klávesu'{0}' - klávesa bude ignorovaná!"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Nedá sa vytvoriť nová chyba. Výsledok: {0}"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Otvorí okno OpenStreetBugs a aktivuje automatické sťahovanie"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Naozaj označiť tento problém ako \"hotový\"?"
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Niektorý z vybratých súborov bol prázdny !!!"
-
-#~ msgid "Open an other photo"
-#~ msgstr "Otvoriť inú fotografiu"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Som v časovej zóne: "
-
-#~ msgid "Update position for: "
-#~ msgstr "Aktualizovať pozíciu pre: "
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</"
-#~ "html>"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Obrázky bez exif pozície"
-
-#~ msgid "All images"
-#~ msgstr "Všetky obrázky"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Otvoriť obrázky s AgPifoJ..."
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Nahratá GPX stopa(trasa)"
-
-#~ msgid "near"
-#~ msgstr "blízko"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Prosím zadajte hľadaný reťazec"
-
-#~ msgid "zoom"
-#~ msgstr "zväčšenie"
-
-#~ msgid "load data from API"
-#~ msgstr "nahrať dáta z API"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Plugin \"Remote Control\" počúva vždy na porte 8111 localhostu. Číslo "
-#~ "portu sa nedá zmeniť, pretože s použitím tohoto čísla počítajú vnútorné "
-#~ "aplikácie využívajúce tento plugin."
-
-#~ msgid "change the viewport"
-#~ msgstr "zmena pohľadu"
-
-#~ msgid "change the selection"
-#~ msgstr "zmena výberu"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Plugin umožňujúci ovládanie JOSM z iných aplikácií."
-
-#~ msgid "Grid layer:"
-#~ msgstr "Vrstva mriežky:"
-
-#~ msgid "Grid layout"
-#~ msgstr "Rozloženie mriežky"
-
-#~ msgid "World"
-#~ msgstr "Svet"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu."
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Tento test kontroluje prítomnosť ciest, železníc a vodných ciest, ktoré "
-#~ "sa krížia v rovnakej vrstve, ale nie sú spojené spoločným bodom."
-
-#~ msgid "Painting problem"
-#~ msgstr "Problém s vykresľováním"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Neplatná kombinácia klúča/hodnoty"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Prosíme napíšte chybovú správu v {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Opíšte (detailne) kroky, ktoré vedú k chybe."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Prosím pripojte nasledujúcu informáciu:"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Nájdený <member> element mimo relácie."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Projekcia nemôže byť načítaná z nastavení. Použijem EPSG:4326"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Prosím zadajte meno pre umiestnenie."
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Prepáčte, nefunguje s anonymnými uživateľmi."
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Vymeniť výber s dátami užívateľa"
-
-#~ msgid "Please select some data"
-#~ msgstr "Prosím vyberte nejaké dáta"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Otvoriť stránku uživateľa v prehliadači"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Vybrať dáta uživateľa"
-
-#~ msgid "Open User Page"
-#~ msgstr "Otvoriť stránku uživateľa"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Upraviť obsah WMS serverov zobrazených vo WMS menu pluginu"
-
-#~ msgid "standard"
-#~ msgstr "štandartný"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorová loď"
-
-#~ msgid "Boat"
-#~ msgstr "Loď"
-
-#~ msgid "Footway"
-#~ msgstr "Chodník"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Upraviť Turistiku"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Upraviť náročnú horskú turistiku"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Vysokohorská turistika"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Upraviť vysokohorskú turistiku"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Upraviť horskú turistiku"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Náročná horská turistika"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Horská turistika"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Padací most"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Vodné objekty"
-
-#~ msgid "Station"
-#~ msgstr "Stanica"
-
-#~ msgid "Shop"
-#~ msgstr "Obchod"
-
-#~ msgid "Edit Station"
-#~ msgstr "Upraviť stanicu"
-
-#~ msgid "Accomodation"
-#~ msgstr "Ubytovanie"
-
-#~ msgid "map"
-#~ msgstr "mapa"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>Upozornenie: Heslo je uložené v nešifrovanej podobe v konfiguračnom "
-#~ "súbore.<br>Heslo sa prenáša v nešifrovanej podobe v URL na server."
-#~ "<br><b>Nepoužívajte dôležité heslo.</b></html>"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} ostáva. Odosielam {4}: {5} (id: {6})"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}."
-
-#~ msgid "Rotate"
-#~ msgstr "Otočiť"
-
-#~ msgid "rugby"
-#~ msgstr "ragby"
-
-#~ msgid "football"
-#~ msgstr "americký futbal"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motošport"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Upraviť motošport"
-
-#~ msgid "intermedia"
-#~ msgstr "svah pre mierne pokročilých"
-
-#~ msgid "advance"
-#~ msgstr "pre pokročilých"
-
-#~ msgid "Edit Football"
-#~ msgstr "Upraviť americký futbal"
-
-#~ msgid "Football"
-#~ msgstr "Americký futbal"
-
-#~ msgid "Rugby"
-#~ msgstr "Ragby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Upraviť ragby"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Prosím majte na pamäti, že klávesové skratky sa priraďujú pri štarte "
-#~ "JOSM. Preto ak chcete aby sa Vaše zmeny prejavili je potrebné JOSM "
-#~ "<b>reštartovať</b>.</p>"
-
-#~ msgid "Amenities"
-#~ msgstr "Vybavenosť (Amenities)"
-
-#~ msgid "Charge"
-#~ msgstr "Poplatok"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Počet vodičov"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Upraviť obchod s nápojmi"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Neurobiť zmeny"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Najdené viac cieľových \"to\" ciest."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Najdená viac než jedna \"from\" cesta."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Nenajdená cesta \"from\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Neznámy typ člena pre ''{0}''."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Neznáma funkcia ''{0}''."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Chyba: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Varovanie: {0}"
-
-#~ msgid "different"
-#~ msgstr "rôzne"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stupne minúty sekundy"
-
-#~ msgid "S"
-#~ msgstr "J"
-
-#~ msgid "N"
-#~ msgstr "S"
-
-#~ msgid "W"
-#~ msgstr "Z"
-
-#~ msgid "E"
-#~ msgstr "V"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Chystáte sa zmazať body mimo Vami stiahnutú oblasť.<br>Toto môže spôsobiť "
-#~ "problém iným objektom (nevidíte ich), ktoré môžu používať tieto body."
-#~ "<br>Naozaj ich chcete zmazať?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Vyriešiť {0} konfliktov v {1} objektoch."
-
-#~ msgid "Split way segment"
-#~ msgstr "Rozdeliť segment cesty"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA import zlyhal!"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr ""
-#~ "Prosím označte presne tri body, alebo cestu pozostávajúcu z troch bodov."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchronizovať čas s GPS zariadením"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Nenájdené žiadne obrázky s časovými značkami."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Vložte buď site-josm.xml alebo wiki stránku"
-
-#~ msgid "Public"
-#~ msgstr "Verejné"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Pridať novú vrstvu"
-
-#~ msgid "Grid"
-#~ msgstr "Mriežka"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Prázdny člen vo vzťahu (relation)."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Nenajdená cesta \"to\"."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Štýl pre obmedzenie {0} nenajdený."
-
-#~ msgid "false"
-#~ msgstr "nie (nepravda)"
-
-#~ msgid "true"
-#~ msgstr "áno (pravda)"
-
-#~ msgid "position"
-#~ msgstr "pozícia (miesto)"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projekcia \"{0}\" je navrhnutá iba\n"
-#~ "pre zemepisné šírky medzi 46.1° a 57°.\n"
-#~ "Použite iný projekčný systém, ak nepoužívate\n"
-#~ "francúzsky WMS server.\n"
-#~ "Nenahrávajte žiadne dáta po zobrazení tejto hlášky!"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambertova zóna (Francie)"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "Dôležité : súradnice v dátach sú ďaleko od\n"
-#~ "hranice Lambertovej zóny.\n"
-#~ "Nenahrávajte žiadne dáta po zobrazení tejto hlášky!\n"
-#~ "Urobte spätný krok (undo), uložte vašu prácu\n"
-#~ "a začnite v novej vrstve a v novej zóne."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "Odstrániť súvisiaceho(vzťahového) člena"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Odstranené \"{0}\" pre {1} {2}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Odstranené \"{0}\" pre {1} ''{2}''"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\" s funkciou {2}.\n"
-#~ "Zmazať zo vzťahu (relation)?"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Zmazať {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Zmazať {1} {0}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Výber \"{0}\" je používaný vo vzťahu (relation) \"{1}\".\n"
-#~ "Zmazať zo vzťahu (relation)?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Konfliktné vzťahy (relation)"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Neznáme údaje(vety): "
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Poškodené údaje(vety): "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Chyby v kontrolnom súčte: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Nulové súradnice: "
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Zadajte hodnoty pre všetky konflikty"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Duplikovať body {0} do {1} bodov"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Chýbajúci argument pre \"alebo\""
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' v akomkoľvek kľúči, alebo mene."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - neobsahuje 'Bak' v mene."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' kdekoľvek v mene."
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "Použili ste EPSG:4326 projekciu, ktorá môže viesť<br>k nežiadúcemu "
-#~ "výsledku ak budete robiť pravouhlé zarovnanie.<br>Zmeňte vašu projekciu, "
-#~ "aby ste sa zbavili tohto upozornenia.<br>Chcete pokračovať?"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Funkcia zakladajúca vzťahy (relation) členov zkopírovala všetky nové "
-#~ "cesty..\n"
-#~ "Môžete preveriť správnosť, ak je to nevyhnutné."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Chyba pri rozkladaní"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Predvolená skupina ''{0}''"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Nemôžem čítať miestny výsledok vyhľadávania zo servera"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametre sú čítané v poradí, ako sú určované,  presvedčte sa či ste "
-#~ "nevybrali\n"
-#~ "nejaké dáta predtým--výber"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Nastavené {0}={1} pre {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Nastavené {0}={1} pre {2} {3}"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Ťahajte segment cesty na vytvorenie pravouholníka."
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Duplikát vybratých ciest"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Vytvoriť duplikát cesty"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Nemôžem duplikovať neusporiadanú cestu."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Duplikát cesty"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "potvrdzovať všetky požiadavky Vzdialenej kontroly ručne"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Nastavenie pre plugin \"Remote Control\" Vzdialené ovládanie."
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zväčšenie: Koliesko myši, alebo dvojitý kľuk. Posun mapy: Držte pravé "
-#~ "tlačítko myši a hýbte myšou. Výber: Kľuk."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Povolené činnosti"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Neotagované(neoznačené) a nespojené body."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Kontrola či pri kreslení mapy nevznikli chyby."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Kontrola pre poznámky (notes)"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Kvalita stopy poľnej cesty 3"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Kvalita stopy poľnej cesty 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Kvalita stopy poľnej cesty 1"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Kvalita stopy poľnej cesty 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Kvalita stopy poľnej cesty 4"
-
-#~ msgid "Bridleway"
-#~ msgstr "Cesta pre kone"
-
-#~ msgid "sports"
-#~ msgstr "Športový"
-
-#~ msgid "optician"
-#~ msgstr "Očná optika"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Slippy Map"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Stiahnuť obrázok z francúzkeho Cadastre WMS"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "K zapnutiu cadastre WMS pluginu, zmeňte\n"
-#~ "projekciu na Lambert a reštartujte JOSM"
-
-#~ msgid "Zone"
-#~ msgstr "Zóna (oblasť)"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambert zone"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "Nastaviť ručne Lambert zone (e.g. for locations between two zones)"
-
-#~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
-#~ msgstr ""
-#~ "Špeciálny manipulant pre francúzsky kataster wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Prosím čítajte Podmienky pre využívanie (francúzsky): <br><a "
-#~ "href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr."
-#~ "html\"> http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html</a> <BR>predtým, ako nahráte nejaké "
-#~ "dáta vytvorené  týmto pluginom."
-
-#~ msgid "Image grab multiplier:"
-#~ msgstr "Image grab multiplier:"
-
-#~ 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 ""
-#~ "Vybratá cesta(y) ma body mimo sťahovanej oblasti dát.\n"
-#~ "Toto môže viesť k tomu, že body môžu byť náhodou vymazané.\n"
-#~ "Ste si naozaj istý, že chcete pokračovať?"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - obrázky s geoznačkami"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Zobraziť fotky s geoznačkami"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Zatiaľ neoznačkované obrázky"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Vybratá verejne prístupná stopa (trace) v openstreetmap.org"
-
-#~ msgid "No password provided."
-#~ msgstr "Nie je doplnené heslo."
-
-#~ msgid "No username provided."
-#~ msgstr "Nie je doplnené užívateľské meno."
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Prosím vyberte si užívateľa pre používanie author panel"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} boli nájdené s gps značkami."
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier(prekresľovač) obrázka id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "prekresľovač id={0}"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Môžete pridať, upravovať a zmazať WMS položky v nastaveniach pre WMS "
-#~ "plugin - zmeny sa prejavia aj vo WMS menu.\n"
-#~ "\n"
-#~ "Môžete zmeny urobiť aj ručne v hlavnom nastavení, použite nasledujúci "
-#~ "náčrt:\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"
-#~ "Úplný WMS URL vstupný formát napríklad (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"
-#~ "Pre Metacarta's Map Rectifier(prekresľovač http://labs.metacarta.com/"
-#~ "rectifier/ , potrebujete iba príslušný 'id'.\n"
-#~ "Pridať  Metacarta Map Rectifier položku v menu, ručne vytvoriť  URL ako v "
-#~ "tomto príklade,nahradiť 73 s vašim id obrázka:\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"
-#~ "Poznánka: Uistite sa či je možné obrázok použiť, pre autorské práva, ak "
-#~ "máte pochybnosť, nepoužite ho."
-
-#~ msgid "Grid origin location"
-#~ msgstr "Umiestnenie mriežky"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Otáčanie mriežky"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Plugin {0} sa zdá byť poškodený, alebo ho nie je možné automaticky "
-#~ "stiahnuť."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Cesta označená ako plocha nie je uzavretá."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "V súbore \"{0}\" nie je časová značka EXIF"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému."
-
-#~ msgid "image not loaded"
-#~ msgstr "Obrázok nie je nahratý"
-
-#~ msgid "Portcullis"
-#~ msgstr "Mreže"
-
-#~ msgid "park_and_ride"
-#~ msgstr "záchytné parkovisko so zastávkou MHD"
-
-#~ msgid "citymap"
-#~ msgstr "mapa mesta"
-
-#~ msgid "hikingmap"
-#~ msgstr "turistická mapa"
-
-#~ msgid "bicyclemap"
-#~ msgstr "cykloturistická mapa"
-
-#~ msgid "board"
-#~ msgstr "tabuľa"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianist"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Zvoliť, posunúť a otáčať objekty"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Zobraziť panel autorov(spracovateľov)"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autori(spracovatelia): {0}"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Uložiť tieto úpravy?"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Okrem toho, skratky sú aktivované, keď sú prvýkrát priradené k "
-#~ "tlačítku v položke menu(ponuky). Takže niektoré vaše zmeny môžu byť "
-#~ "aktivované ešte pred reštartom --- avšak tiež  bez kolízneho overenia. "
-#~ "Toto je ďalší dôvod pre <b>reštart</b> JOSMu po nejakej urobenej zmene.</"
-#~ "p>"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Otváranie kontroly..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server neobsahuje kontroly"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Zdroje (URL alebo meno súboru) súborov s definíciou predvolieb značenia. "
-#~ "Pozrite http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Základná URL pre OSM server (REST API)"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>Na poslednej stránke v zozname uvedené modifikované klávesy, JOSM  "
-#~ "automaticky priradí do skratiek. Pre všetky zo štyroch druhov skratiek "
-#~ "máte tri možnosti. JOSM vyskúša tieto alternatívy v zaznamenanom poradí "
-#~ "na overenie konfliktov. Ak všetky alternatívy boli použite pre skratky, "
-#~ "tak sú už všetky obsadené, preto miesto nej bude priradená náhodná "
-#~ "skratka.</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr "<p>Pseudo-modifikátor 'vypnutý' vypnúť skratku pri konflikte.</p>"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "Môžete zmeniť počet dní pre objavovanie sa tohto varovania <br>by setting "
-#~ "the config option 'pluginmanager.warntime'.)"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Plugin (archív .jar) je už dostupný. Chcete stiahnuť aktuálnu verziu a "
-#~ "prepísať ňou existujúci súbor (archív .jar)\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambert Zóna 4 cache súbor (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambert Zóna 1 cache súbor (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambert Zóna 3 cache súbor (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambert Zóna 2 cache súbor (.2)"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Vybrať Tableau d'Assemblage"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Dodatočný zdroj automatických-značiek:"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Smerový index'{0}' nenájdený"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Uložiť a Ukončiť"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Odstrániť označené"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Nastavte polohu vybratej WMS vrstvy"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Stred rastra: {0}"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Max. Výška(v metroch)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Max. Šírka (v metroch)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Max. Dĺžka (v metroch)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Zle formulované id bodu"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Mesto/obec {0} je nenájdená, alebo nedostupná na WMS.\n"
-#~ "Prosím skontrolujte jej dostupnosť na www.cadastre.gouv.fr"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Získať stopy budov"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Vymazať vrstvu"
-
-#~ msgid "Login"
-#~ msgstr "Prihlásenie"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Vymazať a Nahrať"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Stiahnuť pluginy"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Riešenie konfliktov"
-
-#~ msgid "autozoom"
-#~ msgstr "automatické zväčšenie"
-
-#~ msgid "autoload tiles"
-#~ msgstr "automatické nahratie dlaždíc"
-
-#~ msgid "SlippyMap"
-#~ msgstr "SlippyMap"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Nastavenia pre SlippyMap plugin."
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Automatické zväčšenie: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Automatické nahratie Dlaždíc: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Max zväčšenie lvl: "
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Priesečník nie je najdený. Nič nebolo zmenené."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Teraz môžu byť spojené iba dve plochy(areas)."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr ""
-#~ "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Pokračovať akokoľvek"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním."
-
-#~ msgid "Cycleway"
-#~ msgstr "Cesta pre cyklistov"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Informácie o pluginoch stiahnuté z {0} stránok"
-#~ msgstr[1] "Informácie o pluginoch stiahnuté z {0} stránky"
-#~ msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok"
-
-#~ msgid "Goods"
-#~ msgstr "Malé nákladná autá a dodávky"
-
-#~ msgid "Move Down"
-#~ msgstr "Posunúť dole"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Editor relácie: {0}"
-
-#~ msgid "Move Up"
-#~ msgstr "Posunút Hore"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Riešiť konflikt"
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Nie je \"via\" bod alebo cesta najdená."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Viac ako jedna \"via\" najdená."
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "Farby bodov traťových segmentov podľa hustoty pozícií (HDOP). Vaše "
-#~ "nahrávacie zariadenie potrebuje pre záznam túto informáciu."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Prosím vyberte aspoň jeden bod, cestu alebo reláciu(vzťah). Iba práve "
-#~ "nahraté elementy majú zaznamenaný priebeh(history)."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Táto činnosť vyžaduje {0} individuálne požiadavky na stiahnutie. Prajete "
-#~ "si pokračovať?"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Najskôr zmente projekciu na {0}."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Chybná projekcia"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Posunúť objekty ťahaním; Shift pridá do výberu (Ctrl na prepínanie); "
-#~ "Shift-Ctrl na otáčanie výberu; alebo zmenu výberu"
-
-#~ msgid "Fade background: "
-#~ msgstr "Vyblednúť pozadie: "
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Najdené {0} zhody z {1} v GPX stope {2}"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Časový rozdiel z {0} dní)"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Zladené {0} z {1} fotiek k GPX stope."
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Fotografie neobsahujú informácie o čase."
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "Vybraté fotografie neobsahujú informácie o čase."
-
-#~ msgid "Default Values"
-#~ msgstr "Východzie hodnoty"
-
-#~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
-#~ msgstr ""
-#~ "Stala sa nejaká chyba, pri skúške či sa hodia fotky ku GPX stope. Môžete "
-#~ "nastaviť posúvatko na manuálne priradenie fotiek."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Aktualizácia pluginov"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 5"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Náročná vysokohorská turistika"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Upraviť náročnú vysokohorskú turistiku"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Tažká vysokohorská turistika"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Upraviť ťažkú vysokohorskú turistiku"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Upraviť padací most"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Upraviť mreže"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Vyberte jedinú, uzavretú cestu s najmenej štyrmi bodmi."
-
-#~ msgid "Edit Airport"
-#~ msgstr "Upraviť letisko"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Upraviť informačnú kanceláriu"
-
-#~ msgid "Map Type"
-#~ msgstr "Typ mapy"
-
-#~ msgid "Board Type"
-#~ msgstr "Typ tabuľe"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Zdroj predvolieb značenia (Tagging preset source)"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Aktualizovať následujúce pluginy:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- teraz používaná verzia je {0}"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Prepínač pohladu na celej obrazovke"
-
-#~ msgid "Full Screen"
-#~ msgstr "Celá obrazovka"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">english</A> "
-#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
-
-#~ msgid "Add grid"
-#~ msgstr "Pridať mriežku"
-
-#~ msgid "Optional"
-#~ msgstr "Voliteľné"
-
-#~ msgid "A special handler for the french land registry WMS server."
-#~ msgstr ""
-#~ "Špeciálny manipulant pre francúzsky WMS server pozemkového registra."
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS "
-#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov."
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Ďalší plugin pre zladenie obrázkov s bodmi v GPS súbore. Zladenie je "
-#~ "urobené, keď 'name(meno)', 'cmt(komentár)' or 'desc(poznámky)' vlastnosti "
-#~ "zo značiek cestných bodov zodpovedajú názvu súboru obrázka."
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Zobrazenie OpenLayers obrázok pozadia"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "Simulovať kľuknutie, keď spravíte malý a krátky pohyb. Toto je použité "
-#~ "pre perá tabletu, keď máte problémy , stačí kľuknúť na tablet bez pohybu "
-#~ "myši (obecný Java - tablet problém)."
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "Nástroje na prácu s autormi/ používateľmi. Výber mapových dát, ktoré "
-#~ "patria vybratému používateľovi, otvoriť prehliadač so zobrazenou vybratou "
-#~ "stránkou profilu autora."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Priamo nahrať TCX súbory z JOSMu."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "OSM dáta validátor(kontrola chýb). Kontroluje problémy v dátach, a určí "
-#~ "opravy pre zachovanie dodržania pravidiel pri tvorbe dát. Spellcheck je "
-#~ "jednotný pre názvy značiek."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Hlavná vlastnosť pluginu je možnosť vymazať body z GPx stopy (track). "
-#~ "Tento plugin môže byť použitý k príprave stôp (track) pre nahratie na OSM "
-#~ "eg. vymazaním nezaujímavých častí stopy (track)"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "Informačné miesto (Turistika) (Guidepost (Hiking))"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Kľuknúť pre pridanie traťových bodov"
-
-#~ msgid "Start routing"
-#~ msgstr "Začať trasovanie"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Odstrániť trasové body"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Kľuknúť a ťahom posunúť trasové body."
-
-#~ msgid "<multiple>"
-#~ msgstr "<mnohonásobný>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Spojiť plochy: Vymazať krátke cesty"
-
-#~ msgid "Closed Way"
-#~ msgstr "Uzavretá cesta"
-
-#~ msgid "Fix relations"
-#~ msgstr "Oprava relácie"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Spojená prekrývajúca sa plocha"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} pluginov úspešne aktualizovaných. Prosím, reštartujte JOSM."
-#~ msgstr[1] "{0} plugin úspešne aktualizovaný. Prosím, reštartujte JOSM."
-#~ msgstr[2] "{0} pluginy úspešne aktualizované. Prosím, reštartujte JOSM."
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Ako ste si mohli všimnúť, že výber kláves ktorý ponúka ďalšia strana "
-#~ "sa nachádza na každom druhu klávesníc ktorá Java pozná, ale nemusí poznať "
-#~ "všetky klávesy na vašej klávesnici. Prosím použite iba hodnoty, ktoré "
-#~ "zodpovedajú skutočnej klávese na vašej klávesnici. Takže ak vaša "
-#~ "klávesnica nemá \"Copy\" klávesu (PC klávesnica ju nemá, SUN klávesnica "
-#~ "ju má), tak ju nepoužite. Tiež tam môžu byť 'klávesy' obsahovo zhodné s "
-#~ "klávesovou skratkou na vašej klávesnici (e.g. ':'/Colon). Prosím tiež ich "
-#~ "nepoužite, miesto nich použite základné klávesy (';'/Semicolon on US "
-#~ "keyboards, '.'/Period on German keyboards, ...). Nerešpektujte nič, čo by "
-#~ "viedlo ku konfliktu, JOSM napríklad nevie, že Ctrl+Shift+; and Ctrl+: sú "
-#~ "zhodné na US klávesnici...</p>"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr ""
-#~ "Podporuje protokol verzií 0.5 a 0.6, zatiaľ čo server hlási podporu {0} "
-#~ "to {1}."
-
-#~ msgid "Error processing changeset upload response"
-#~ msgstr "Chyba pri odpovedi počas nahrávania zmenených súborov."
-
-#~ msgid "Not initialized"
-#~ msgstr "Nie je inicializované"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "Neznáma verzia: {0}"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Zmeny nie sú uložené. Chcete pokračovať bez uloženia ?"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny."
-
-#~ msgid "File could not be found."
-#~ msgstr "Súbor nie je možné nájsť."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Zadajte súradnice nového bodu."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Niektoré z bodov sú (skoro) na priamke"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Spojiť cesty patriace do rôznych vzťahov (relátion)?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Aj tak spojiť"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Všetky cesty boli prázdne"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Tieto body netvoria kružnicu."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Zlúčiť body s rôznymi členmi ?"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich "
-#~ "chcete zlúčiť ?"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Zvoľte minimálne dva body pre zlúčenie"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Aj tak zlúčiť"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Počas ukladania došlo k chybe."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Počas obnovenia zálohy došlo k chybe."
-
-#~ msgid "Update Data"
-#~ msgstr "Aktualizovať údaje"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Žiadne údaje pre uloženie sú nenájdené. Máte otvorenú, alebo načítanú "
-#~ "údajovú vrstvu?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Aktualizácia zvolenej údajovej vrstvy zo servera (re-downloads data)"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva údajov"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "V priebehu sťahovania nastala nasledujúca chyba :"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Chyby v priebehu sťahovania"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr ""
-#~ "Maximálna dĺžka (v metroch) pre kresbu čiar lokálnych súborov. Nastavte "
-#~ "'-1' pre kresbu všetkých čiar."
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projekcia \"{0}\" je navrhnutá iba pre\n"
-#~ "zemepisné šírky medzi 45.7° and 47.9°\n"
-#~ "a zemepisné dĺžky medzi 5.7° and 10.6°.\n"
-#~ "Použite iný projekčný systém ak nepracujete\n"
-#~ "s dátami zo Švajčiarska, alebo Lichtenštajnska.\n"
-#~ "Nenahrávajte žiadne dáta po tejto správe."
-
-#~ msgid "Data upload failed for unknown reason"
-#~ msgstr "Chyba pri nahrávaní z neznámeho dôvodu"
-
-#~ msgid "Cannot read numeric value from response"
-#~ msgstr "Nemôžem čítať číselné hodnoty z odpovede"
-
-#~ msgid "Occupied By"
-#~ msgstr "Využité (kým)"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Uložiť do OSM..."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Iba dôležité smery (napr. jednosmerka)"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Pripája sa na OSM server..."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Uložiť všetky zmeny na OSM server."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM používateľské meno (email)"
-
-#~ msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-#~ msgstr "Chýba atribút \"version\" v OSM elemente s  id {0}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"version\" on OSM primitive with id {0}, got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Neplatná hodnota atribútu \"version\" v OSM elemente s  id {0} (hodnota  "
-#~ "{1})"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Chýba číslo verzie z OSM údajov"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Nepodarilo sa nadviazať spojenie s OSM serverom {0}.\n"
-#~ "Skontrolujte URL servera vo vašich nastaveniach a funkčnosť vašeho "
-#~ "pripojenia na internet."
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "V programe sa vyskytla chyba.\n"
-#~ "\n"
-#~ "Ak používate najnovšiu verziu JOSM, zvážte vyplnenie a odoslanie hlásenia "
-#~ "o chybe."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme "
-#~ "vývojárov JOSM."
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr ""
-#~ "Typ projekcie nie je možné prečítať z nastavení. Použije sa Mercator "
-#~ "projekcia."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "Chýba atribút \"type\" člena {0} relácie  {1}"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr "Neplatné hodnota atribútu \"ref\" člena relácie  {0} (hodnota  {1})"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "Obrázok na ceste {0} neexistuje alebo sa neda prečítať."
-
-#~ msgid "linked"
-#~ msgstr "zviazané"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "ZmeňÚlohuČlenaRelácie"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "Chýba atribút \"ref\" člena relácie  {0}"
-
-#~ msgid "More details"
-#~ msgstr "Viac detailov"
-
-#~ msgid "% of lat:"
-#~ msgstr "% lat:"
-
-#~ msgid "% of lon:"
-#~ msgstr "% lon:"
-
-#~ msgid "Resolve conflicts in member list of of relation {0}"
-#~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Zlé číslo parametrov pre operátor bodov."
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "Nesprávna hodnota pre id operátor: {0}.  Číslo je očakávané."
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "Nesprávna hodnota operátora bodov: {0}. Operátor bodov čaká čísla bodov, "
-#~ "alebo rozsah bodov, napr. body:10-20"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Vyriešte {0} konfliktov značiek v {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Vyriešte konflikt v poradí bodov v ceste {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Vyriešte konflikt verzií pre {0} {1}"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "Značky({0} konfliktov)"
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "položka {0} sa v zozname nenachádza"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "aktuálny parameter je mimo rozsahu: got {0}"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr ""
-#~ "Kopírovať moje vybrané elementy pred prvý vybraný element v zozname pre "
-#~ "spojované elementy"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr ""
-#~ "Kopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr ""
-#~ "Kopírovať ich vybrané elementy pred prvý vybraný element v zozname pre "
-#~ "spojované elementy"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr ""
-#~ "Kopírovať moje vybrané elementy za prvý vybraný element v zozname pre "
-#~ "spojované elementy"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr ""
-#~ "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Klik <strong>{0}</strong>pre koniec spojovania mojich a ich "
-#~ "položiek</html>"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Klik <strong>{0}</strong>pre začiatok spojovania mojich a ich "
-#~ "položiek</html>"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "Blokovať aktuálny zoznam spojovaných elementov"
-
-#~ msgid "argument \"adjustable\" must not be null"
-#~ msgstr "argument \"nastaviteľný\" nemôže byť nula"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "neočakávaný index stĺpca. Got {0}"
-
-#~ msgid "argument \"view\" must not be null"
-#~ msgstr "argument \"pohľad(view)\" nesmie byť nulový"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "nastaviteľný {0} ešte neregistrovaný"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr ""
-#~ "nastaviteľný {0} ešte neregistrovaný. Nie je možné nastaviť spoluúčasť v "
-#~ "nastavení synchronizácii"
-
-#~ msgid "parameter \"my\" most not be null"
-#~ msgstr "parameter \"môj(my)\" nesmie byť nulový"
-
-#~ msgid "parameter \"their\" must not be null"
-#~ msgstr "parameter \"ich(their) nesmie byť nulový"
-
-#~ msgid "parameter \"way\" must not be null"
-#~ msgstr "parameter \"cesta(way)\" nesmie byť nulový"
-
-#~ msgid "parameter 'my' must not be null"
-#~ msgstr "parameter 'môj(my)' nesmie byť nulový"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz"
-
-#~ msgid "parameter their must not be null"
-#~ msgstr "parameter ich(their) nesmie byť nulový"
-
-#~ msgid "parameter my most not be null"
-#~ msgstr "parameter môj(my) nesmie byť nulový"
-
-#~ msgid "parameter way must not be null"
-#~ msgstr "parameter cesty nesmie byť nulový"
-
-#~ msgid "parameter 'their' must not be null"
-#~ msgstr "parameter 'ich(their)' nesmie byť nulový"
-
-#~ msgid "parameter 'key' must not be null"
-#~ msgstr "parameter 'kľúč' nesmie byť nulový"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "parameter 'primitive' must not be null"
-#~ msgstr "parameter 'pôvodný' nesmie byť nulový"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "nie je možné použiť neistú značku pri spojovaní prvkov"
-
-#~ msgid "argument 'decision' must not be null"
-#~ msgstr "argument 'rozhodnutie' nesmie byť nulový"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "Použiť čiastočné rozhodnutie"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got "
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>Nemôžete ukončiť rozhodnutie pre všetky konflikty.<br>Kľuk <strong>"
-#~ "{0}</strong> použite už rovnako rozhodnuté konflikty.<br>Môžete rozhodnúť "
-#~ "o zostávajúcich konfliktoch neskôr.<br>Kľuk <strong>{1}</strong> pre "
-#~ "návrat do riešenia konfliktov.</html>"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "{0} Pluginy je úspešne stiahnuté. Prosím reštartujte JOSM."
-#~ msgstr[1] "{0} Plugin je úspešne stiahnutý. Prosím reštartujte JOSM."
-#~ msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte JOSM."
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}."
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "Je dosiahnutý koniec línie"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "Vybrať a spustiť body na konci cesty"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Je dosiahnuté spojenie"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "parameter '{0}' nesmie byť nulový"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "nemôžem vyriešiť nerozhodnutý konflikt"
-
-#~ msgid "Uploading"
-#~ msgstr "Nahrávanie"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Nahrávanie na OSM API neúspešné"
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Kontrolujem či body {0} sú úplné(gone) ..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Obnovujem reláciu..."
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Áno, obnoviť ich tiež"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nie, zrušiť operáciu"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Sú tam {0} ďalšie body použité v ceste {1}<br>ktoré sú vymazané na "
-#~ "servery.<br><br>Chcete obnoviť tieto body tiež?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Obnoviť pridané body?"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Obnovovanie cesty..."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">english</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">english</A> "
-#~ "or <A HREF=\"{1}\">váš jazyk</A>."
-
-#~ msgid "Keep mine"
-#~ msgstr "Ponechať zdroj"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Kontrolujem či sú závislosti {0} is gone ..."
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Obnoviť pôvodné závislé odkazy?"
-
-#~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
-#~ msgstr ""
-#~ "<html>Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}<br>ktoré sú zmazané "
-#~ "na servery.<br><br>Chcete ich obnoviť tiež?</html>"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Typ projekcie nie je možné prečítať z nastavení. Použije sa Mercator "
-#~ "projekcia."
-
-#~ msgid "Update failed"
-#~ msgstr "Aktualizácia neúspešná"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Chyba pri aktualizácii vybraných pôvodných."
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "neočakávaná hodnota. Dostal {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Pôvodný vymazaný na servery"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>OSM pôvodné s id <strong>{0}</strong> bolo vymazané<br>na servery "
-#~ "iným mapérom.<br><br>Click <strong>{1}</strong> pomechať vaše pôvodné a "
-#~ "ignorovať vymazaný stav.<br>Vašemu pôvodnému bode priradené nové id."
-#~ "<br>Click <strong>{2}</strong> prijať stav na servery a vymazať váš "
-#~ "pôvodný stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Zmazať moje"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Sú tam <strong>{0}</strong> pôvodné <br>vybrané pre individuálnu "
-#~ "aktualizáciu. Prosím zmenšite výber<br>pre max. {1} pôvodný.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Výber je príliš veľký"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu."
-
-#~ msgid "Update Selection"
-#~ msgstr "Aktualizácia výberu"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Aktualizovať práve vybrané pôvodné zo servera"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Nemôžem nájsť pôvodné s id {0} v aktuálnej dátovej sade"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Chýbajúce pôvodné"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Aktualizácia pôvodných"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synchronizovať {0} {1} iba"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Varovanie: chybné záhlavie \"{0}\" nie je zhoda  s očakávanou schémou "
-#~ "\"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Aktualizácia <strong>neúspešná</strong> pretože pôvodné sa "
-#~ "snaží<br>zmazať na servery už zmazané.<br><br>Chybová správa je:<br>{0}</"
-#~ "html>"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Zistený konflikt"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Pôvodné je už zmazané"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Obnoviť {0} pôvodných"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Varovanie: Vyčistená cesta {0} pretože množstvo bodov sa znížilo 2. "
-#~ "Aktuálne je {1}"
-
-#~ msgid "Purging 1 primitive"
-#~ msgstr "Vyčistenie 1 pôvodného"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Chyba počas komunikácie so serverom"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Vymazané alebo presunuté pôvodné"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them on "
-#~ "the server the server is likely to report a<br>conflict.<br><br>Click "
-#~ "<strong>{1}</strong> to check these primitives individually.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Sú tam {0} pôvodné vo vašej lokálnej dátovej sada ktoré<br>by mohli "
-#~ "byť zmazané na servery. Ak pozdejšie skúsite vymazať, "
-#~ "alebo<br>aktualizovať ich na server, server pravdepodobne "
-#~ "oznámy<br>konflikt.<br><br>Click <strong>{1}</strong> pre kontrolu týchto "
-#~ "pôvodných individuálne.<br>Click <strong>{2}</strong>pre ignorovanie."
-#~ "<br></html>"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Nasledujúce chyby nastali behom hromadného sťahovania:"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii"
-
-#~ msgid "changeset"
-#~ msgstr "changeset"
-
-#~ msgid "changesets"
-#~ msgstr "changesets"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "nenájdená predchádzajúca verzia. História je prázdna."
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr ""
-#~ "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''"
-
-#~ msgid "Didn't find an historized primitive with id {0} in this dataset"
-#~ msgstr "Nemôžem nájsť v histórii pôvodné s id {0} v tejto dátovej sade"
-
-#~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-#~ msgstr "Nemôžem nájsť pôvodné s id {0} a verziou {1} v tejto dátovej sade"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parameter ''{0}'' nesmie byť nulový"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "parameter ''{0}'' > 0 očakávaný, dostáva ''{1}''"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "nenájdená staršia verzia. História je prázdna."
-
-#~ msgid "Didn't find an  primitive with id {0} in this dataset"
-#~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "Chyba počas komunikácie so serverom"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transferred in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
-#~ "<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
-#~ "<br><b>Nepoužite vzácne Heslo.</b></html>"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM užívateľské meno (e-mail)"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}'' typu long , dostáva ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type long (>=0), got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}'' typu long (>=0), dostáva "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "povinný atribút ''{0}'' vynechaný"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''"
-
-#~ msgid ""
-#~ "unexpected format of new version of modified primitive ''{0}'', got "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "neočakávaný formát novej verzie zo zmenených pôvodných ''{0}'', dostáva "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "Varovanie: preferencie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-#~ "požadovaná pre použitie zmenenej sady, ale API nie je ovládané nimi. "
-#~ "Ignorovať zmenenú sadu."
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "Neúspešné nadviazanie spojenia do API {0}"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, "
-#~ "got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}'' typu OsmPrimitiveType, "
-#~ "dostáva ''{1}''"
-
-#~ msgid ""
-#~ "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}'' typu boolean, dostáva "
-#~ "''{1}''"
-
-#~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-#~ msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Môžete pridať, editovať and mazať WMS údaje vo WMSplugin Preference Tab - "
-#~ "toto sa potom zobrazí vo WMS menu.\n"
-#~ "\n"
-#~ "Môžete to tiež urobiť manuálne v Advanced Preferences, Použite "
-#~ "nasledujúcu schému:\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"
-#~ "Úplný WMS URL vstupný format napríklad (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "Pre Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ ,"
-#~ "potrebujete iba aktuálne vstupné 'id'.\n"
-#~ "Pre pridanie Metacarta Map Rectifier položky menu, manuálne vytvorte URL "
-#~ "ako v tomto príklade, položenie 73 vášho obrázka 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"
-#~ "Poznámka: Použite iba vhodné obrázky, voľne šíriteľné(copyright-wise), ak "
-#~ "máte pochybnosti, nepoužite ich."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Nemohol som nájsť prístupovú linku alebo id do vybranej služby. Prosím "
-#~ "skúste znovu."
-
-#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check these primitives individually.<br>Click <strong>{2}</"
-#~ "strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Sú tam {0} pôvodné vo vašej lokálnej dátovej sade ktoré<br>by mohni "
-#~ "byť zmazané na servery. Ak pozdejšie skúsite vymazať, "
-#~ "alebo<br>aktualizovať ich na server príde pravdepodobne "
-#~ "správa<br>konflikt.<br><br>Click <strong>{1}</strong> na kontrolu týchto "
-#~ "pôvodných individuálne.<br>Click <strong>{2}</strong> pre ignorovanie."
-#~ "<br></html>"
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Dĺžka hodnoty pre značku ''{0}'' pri pôvodnej {1} prekročila max. "
-#~ "povolenú dĺžku {2}. Dĺžka hodnôt je {3}."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "VAROVANIE: neočakávaný formát z API základne URL. Presmerovávanie na "
-#~ "stránku histórie pre OSM pôvodné budú pravdepodobne chybné. API základňa "
-#~ "URL je: ''{0}''"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "VAROVANIE: uvedený prehliadač okien poprvýkrát  {0} of {1} {0} of {1} "
-#~ "vybrané iba pôvodné"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Neúspešná inicializácia API. Prosím skúste to znova pozdejšie ."
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je "
-#~ "{0}, maximálne je {1}"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri "
-#~ "vymazávaní pôvodných {1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API inicializácia neúspešná"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Vzťahy v členoch bolo skopírované do všetkých nových ciest.\n"
-#~ "Mali by ste toto potvrdiť a opraviť ak je to potrebné."
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "vybranie odkazu z relácie {0}"
-
-#~ msgid "removing reference from way {0}"
-#~ msgstr "vybranie odkazu z cesty {0}"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Zostáva môj viditeľný stav"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Áno, vynulovať id"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Spojenie so serverom zlyhalo"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Je tam {0} pôvodných vo vašej lokálnej dátovej sade, ktoré<br>ktoré "
-#~ "by mohli byť zmazané zo servera. Ak pozdejšie skúsite zmazať, "
-#~ "alebo<br>aktualizovať ich server pravdepodobne ohlási<br>konflikt."
-#~ "<br><br>Click <strong>{1}</strong>kontrola stavutýchto pôvodných<br>na "
-#~ "servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
-
-#~ msgid ""
-#~ "My primitive with id {0} and version {1} is visible although their "
-#~ "primitive with lower version {2} is not visible. Can't deal with this "
-#~ "inconsistency. Keeping my primitive. "
-#~ msgstr ""
-#~ "Moje pôvodné s id {0} a verziou {1} sú viditeľné pretože ich pôvodné sú v "
-#~ "nižšej verzii {2} nie sú viditeľné. Nenastala dohoda s touto "
-#~ "nezrovnalosťou. Zostávajú moje pôvodné. "
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "neviditeľné (na servery)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "viditeľné (na servery)"
-
-#~ msgid "Visible State:"
-#~ msgstr "Viditeľný Stav:"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Fyzicky vymazať z lokálnej verzie"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Zostáva klon lokálnej verzie"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Nastaviť id na 0"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Ponechať svoj viditeľný stav"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Áno, očistiť to"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM odstráni vaše lokálne pôvodné s id {0}<br>z dátovej sady."
-#~ "<br>Súhlasíte?</html>"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Odstrániť z dátovej sady"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Ponechať vašu lokálnu verziu, JOSM<br>má nastaviť id z {0} {1} na 0."
-#~ "<br>Pri ďalšom nahrávaní na server bude priradené<br>nové id."
-#~ "<br>Súhlasíte?</html>"
-
-#~ msgid "index out of bounds Got {0}"
-#~ msgstr "index je mimo hranice Dostať {0}"
-
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr "<html>Chybný priebeh nahrávania zo servera. Detaily:<br>{0}</html>"
-
-#~ msgid ""
-#~ "failed to set reference. reference version {0} not available in history"
-#~ msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
-
-#~ msgid "History item"
-#~ msgstr "Položka priebehu"
-
-#~ msgid "history not initialized yet. Failed to set reference primitive."
-#~ msgstr ""
-#~ "priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "Priebeh (History) pre {0} {1}"
-
-#~ msgid "Display the history of the selected primitive"
-#~ msgstr "Zobraziť priebeh z vybraných pôvodných"
-
-#~ msgid "Loading history for {0} with id {1}"
-#~ msgstr "Nahrávam priebeh pre {0}s id {1}"
-
-#~ msgid "history not initialized yet. Failed to set current primitive."
-#~ msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
-
-#~ msgid "failed to set current. current version {0} not available in history"
-#~ msgstr ""
-#~ "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>Verzia <strong>{0}</strong> vytvoraná na <strong>{1}</strong> podľa "
-#~ "<strong>{2}</strong></html>"
-
-#~ msgid ""
-#~ "no primitive with id {0} in local dataset. Can't infer primitive type"
-#~ msgstr ""
-#~ "žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ "
-#~ "pôvodných"
-
-#~ msgid "image loading..."
-#~ msgstr "nahrávam obrázok..."
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "TangoGPS import neúspešný!"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>Openstreetbus plugin používa starý server v appspot.com.<br>Nový "
-#~ "server je dostupný na schokokeks.org.<br>Chcete prejsť na nový server? "
-#~ "(Veľmi odporúčame)</html>"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive"
-#~ msgstr ""
-#~ "Server odpovedal s chybovou kód 404, opakovanie s individuálnou žiadosťou "
-#~ "pre každý pôvodný"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Zmeniť {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Pridať {0} {1}"
-
-#~ msgid "ChangeRelationMemberRole {0} {1}"
-#~ msgstr "ChangeRelationMemberRole {0} {1}"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Otočiť {0} {1}"
-
-#~ msgid "RemoveRelationMember {0} {1}"
-#~ msgstr "OdstrániťRelačnýČlen {0} {1}"
-
-#~ msgid "already registered a conflict for primitive ''{0}''"
-#~ msgstr "práve zapísaný má konflikt s pôvodným ''{0}''"
-
-#~ msgid "Main.ds doesn't include node {0}"
-#~ msgstr "Hlavný.ds neobsahuje bod {0}"
-
-#~ msgid "UTM Zone {0}"
-#~ msgstr "UTM Zone {0}"
-
-#~ msgid "WGS84 Geographisch"
-#~ msgstr "WGS84 Geographisch"
-
-#~ msgid "Layer {0} must be in list of layers"
-#~ msgstr "Vrstva {0} musí byť v zozname vrstiev"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam"
-
-#~ msgid "Members: {0} (linked: {1})"
-#~ msgstr "Členy: {0} (spojenie: {1})"
-
-#~ msgid "Used style"
-#~ msgstr "Použitý štýl"
-
-#~ msgid "Defaults (See tooltip for detailed information)"
-#~ msgstr "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)"
-
-#~ msgid "Copy defaults"
-#~ msgstr "Kopírovať východzie"
-
-#~ msgid "Icon paths"
-#~ msgstr "Icon paths"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikt v dátach"
-
-#~ msgid "No data"
-#~ msgstr "Žiadne dáta"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Upload <strong>zlyhal</strong>.<br>{0}</html>"
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Presunuli ste viac ako {0} objektov. Presun veľkého množstva objektov je "
-#~ "často chyba.\n"
-#~ "Skutočne ich presunúť?"
-
-#~ msgid "The server replied an error with code {0}"
-#~ msgstr "Server odpovedal chybou s kódom {0}"
-
-#~ msgid "Add a new XML source to the list."
-#~ msgstr "Pridať nový XML zdroj do zoznamu."
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Odstrániť člena relácie {0} {1}"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not able to handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "UPOZORNENIE: preferencie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-#~ "požaduje použiť zmenu nastavení, ale API nie je schopné ovládať ich. "
-#~ "Ignorujem zmenu nastavení."
-
-#~ msgid "The XML source (URL or filename) for {0} definition files."
-#~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Click."
-#~ msgstr ""
-#~ "<b>Zoom:</b> Koliesko myši, dvojklik alebo Ctrl + Hore/Dole <b>Pohyb mapy:"
-#~ "</b> Podržať pravé tlašítko myši a pohnúť myšou alebo použiť kurzorové "
-#~ "klávesy. <b>Vybrať:</b> Click."
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!"
-
-#~ msgid "image "
-#~ msgstr "obrázok "
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Sťahovanie pôvodných odkazov do jedného vybraného pôvodného"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Sťahovanie odkazov z OSM..."
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Nahrávanie nadradených z pôvodných {2}"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Sťahovanie odkazov..."
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "paramenter ''{0}'' nesmie byť nulový"
-
-#~ msgid ""
-#~ "<html>The relation has changed outside of the editor.<br>Your edit can't "
-#~ "be applied directly, a conflict has been created instead.</html>"
-#~ msgstr ""
-#~ "<html>Relácia má zmenenú vonkajšiu z editora.<br>Vaša editácia nemôže byť "
-#~ "aplikovaná priamo, kvôli vytvoreniu konfliktu.</html>"
-
-#~ msgid "Conflict created"
-#~ msgstr "Konflikt je vytvorený"
-
-#~ msgid ""
-#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
-#~ "{0}"
-#~ msgstr ""
-#~ "Chytená bezpečnostné výnimka pre setAlwaysOnTop().Ignorujem. Výnimka "
-#~ "bola: {0}"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým "
-#~ "vybraným členom"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným "
-#~ "vybraným členom"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom"
-
-#~ msgid "Delete the currently selected tags"
-#~ msgstr "Vymazať aktuálne vybrané značky"
-
-#~ msgid "Linked"
-#~ msgstr "Spojený"
-
-#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-#~ msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Plug-in {0} nie je dostupný. Aktualizácia preskočená."
-
-#~ msgid ""
-#~ "marked way {0} incomplete because referred nodes are missing in the "
-#~ "loaded data"
-#~ msgstr ""
-#~ "značená cesta {0} je neúplná pretože odkazované body chýbajú v načítaných "
-#~ "dátach"
-
-#~ msgid "parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "parameter ''{0}'' > 0 požadovaný. Got {1}"
-
-#~ msgid "id parameter ''{0}'' > 0 required. Got {1}"
-#~ msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
-
-#~ msgid ""
-#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-#~ "found."
-#~ msgstr ""
-#~ "Nečakaná verzia  JOSMu. Žiadny Main.ds ani Main.getCurrentDataSet() found."
-
-#~ msgid ""
-#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-#~ msgstr ""
-#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main."
-#~ "getCurrentDataSet()"
-
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Neúspešný  prístup k systémovej vlastnosti ''{0}'' z bezpečnostného "
-#~ "dôvodu. Výnimka bola: {1}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikty počas sťahovania"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
-
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}"
-
-#~ msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-#~ msgstr "<html>Nemôžem čítať súbor ''{0}''. Chyba je: <br>{1}</html>"
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie "
-#~ "jednej požiadavky na zmenené pôvodné"
-
-#~ msgid "upload all changes in one request"
-#~ msgstr "nahrať všetky zmeny v jednej požiadavke"
-
-#~ msgid "Didn't find a primitive with id {0} in the current dataset"
-#~ msgstr "Neviem zistiť pôvodné s id {0} v aktuálnej dátovej sade"
-
-#~ msgid "Can't search because there is no loaded data."
-#~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>Vrstva ''{0}'' má práve konflikt pre obecné<br>''{1}''.<br>Tento "
-#~ "konflikt nemôže byť pridaný.</html>"
-
-#~ msgid "The following errors occurred during mass download:{0}"
-#~ msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Neúspešné nahratie záložiek z ''{0}'' pre bezpečnostné dôvody. Výnimka "
-#~ "bola: {1}"
-
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Varovanie:vrstva ''{0}'' neexistuje. Nemôžem odstrániť konflikt pre "
-#~ "pôvodné ''{1}''"
-
-#~ msgid "<html>Could not read bookmarks.<br>{0}</html>"
-#~ msgstr "<html>Nemôžem čítať záložky.<br>{0}</html>"
-
-#~ msgid "UTM20N Martinique Fort Desaix 1952"
-#~ msgstr "UTM20N Martinique Fort Desaix 1952"
-
-#~ msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-#~ msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''."
-#~ "<br>Host name ''{1}'' couldn''t be resolved. <br>Please check the API URL "
-#~ "in your preferences and your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
-#~ "<br>Meno hostiteľa ''{1}'' nemôže byť vyriešený. <br>Prosím skontrolujte "
-#~ "API URL vo vašich nastaveniach a vaše internetové pripojenie.</html>"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you didn''t load your applet from ''{1}''.</html>"
-#~ msgstr ""
-#~ "<html>Neúspešné otváranie a pripájanie na  vzdialený "
-#~ "server<br>''{0}''<br>pre bezpečnostné dôvody. Toto je veľmi pravdepodobné "
-#~ "pretožestále bežíte<br>v nejakom applete a pretože nemôžete načítať váš "
-#~ "applet z ''{1}''.</html>"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Nemôžem zapísať záložku.<br>{0}</html>"
-
-#~ msgid "UTM20N Guadeloupe Ste-Anne 1948"
-#~ msgstr "UTM20N Guadeloupe Ste-Anne 1948"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
-
-#~ msgid ""
-#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-#~ msgstr ""
-#~ "Nachádzajú sa neuložené zmeny vo vrstve''{0}''. Vymazať vrstvu určite?"
-
-#~ msgid ""
-#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
-#~ "Exception: {0}"
-#~ msgstr ""
-#~ "Varovanie: nemôžem setAlwaysOnTop(true) pre ConflictResolution Dialog. "
-#~ "Výnimka: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to bring extended dialog always on top. Exception: {0}"
-#~ msgstr ""
-#~ "Varovanie: neúspešné otvorenie rozšíreného dialógu vždy na vrchu. "
-#~ "Výnimka: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put ''please wait dialog'' always on top. Exception "
-#~ "was: {0}"
-#~ msgstr ""
-#~ "Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. "
-#~ "Výnimky boli: {0}"
-
-#~ msgid "Do you really want to delete layer ''{0}''?"
-#~ msgstr "Naozaj chcete vymazať vrstvu ''{0}''?"
-
-#~ msgid "Confirmation"
-#~ msgstr "Potvrdenie"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Vymazávaná vrstva {0} z {1}"
-
-#~ msgid "Delete all"
-#~ msgstr "Zmazať všetko"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>relácia dieťa<br>{0}<br>je na servery zmazaná.Nemôže byť načítaná."
-
-#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka "
-#~ "bola: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put properties dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na "
-#~ "vrchu. Výnimka bola: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie dialógového okna prepínač vždy na vrchu. "
-#~ "Výnimka bola: {0}"
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is dicuraged."
-#~ "<br>How do you want to proceed with circular dependencies?</html>"
-#~ msgstr ""
-#~ "<html>Je tam aspoň jeden člen odkazujúci na túto reláciu<br>na vlastnú "
-#~ "reláciu.<br>Táto vytvorená kruhová závislosť and is dicuraged.<br>Ako "
-#~ "chcete pokračovať s kruhovou závislosťou?</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Viacnásobné členy odkazujú na rovnaké obecné"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>Táto relácia už má jedného alebo viac členov odkazujúcich "
-#~ "na<br>pôvodné ''{0}''<br><br>Skutočne chcete pridať ďalšieho relačného "
-#~ "člena?</html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Vrstva ''{0}'' už mala konflikt pre pôvodné<br>''{1}''.<br>Prosím "
-#~ "rozhodnite najskôr tento konflikt, potom skúste znovu.</html>"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Nastavujete prázdnu funkciu na {0} pôvodných.<br>Toto sa rovná "
-#~ "vymazaniu funkcie z týchto pôvodných.<br>Skutočne chcete použiť novú "
-#~ "funkciu?</html>"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Výber pôvodných pre vybraté členy relácie"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>Táto relácia bola zmenená zvonku z editoru.<br>Nemôžete použiť "
-#~ "zmeny pokračovať v editácii.<br><br>Chcete vyriešiť konflikt a zavrieť "
-#~ "editor?</html>"
-
-#~ msgid "No, don't apply"
-#~ msgstr "Nie, použite to"
-
-#~ msgid "Zoom to primitive the first selected member refers to"
-#~ msgstr "Zväčšiť na pôvodné prvé vybraté členy odkazujúce na"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr ""
-#~ "Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: "
-
-#~ msgid "child.id >0 expected. Got {1}"
-#~ msgstr "dieťa.id >0 očakávané. Got {1}"
-
-#~ msgid "Fetching a package of {0} from ''{1}''"
-#~ msgstr "Donášam balíček z {0} pre ''{1}''"
-
-#~ msgid "Fetching {0} with id {1} from ''{2}''"
-#~ msgstr "Donášam {0} s id {1} z ''{2}''"
-
-#~ msgid ""
-#~ "Warning: failed to put history browser always on top. Exception was: {0}"
-#~ msgstr ""
-#~ "Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka "
-#~ "bola: {0}"
-
-#~ msgid "Could not export \"{0}\""
-#~ msgstr "Nemôžem exportovať \"{0}\""
-
-#~ msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Nejaká chyba nastala počas ukladania.<br>Chyba je: <br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is: <br>{0}"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Nejaká chyba nastala počas obnovy záložného súboru.<br>Chyba je: "
-#~ "<br>{0}</html>"
-
-#~ msgid "Unknown relation member type {0}"
-#~ msgstr "Neznámy typ člena relácie {0}"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Očakávaný príklad z OsmDataLayer. Got ''{0}''."
-
-#~ msgid ""
-#~ "Failed to close changeset {0}, will be closed by server after timeout. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového "
-#~ "limitu servera. Výnimka bola: {1}"
-
-#~ msgid ""
-#~ "marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too"
-#~ msgstr ""
-#~ "Označená cesta {0} s {1} bodov neúplných pretože aspoň jeden bod je "
-#~ "vynechaný v nahratých dátach a je preto nekompletná tiež"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté."
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej "
-#~ "potrebný."
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the current projection to one of the cadastre\n"
-#~ "projection and retry"
-#~ msgstr ""
-#~ "Zapnúť the cadastre WMS plugin, zmeniť\n"
-#~ "aktuálnu projekciu na jednu z  the cadastre\n"
-#~ "projekcií a opakovať"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Prosím vybrať WMS vrstvu pre nastavenie."
-
-#~ msgid ""
-#~ "Warning: failed to acccess directory ''{0}'' for security reasons. "
-#~ "Exception was: {1}"
-#~ msgstr ""
-#~ "Varovanie: neúspešný vstup do adresára ''{0}'' pre bezpečnostný dôvod . "
-#~ "Výnimka bola: {1}"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Vybrať WMS vrstvu"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie."
-
-#~ msgid ""
-#~ "failed to set reference. reference id {0} doesn't match history id {1}"
-#~ msgstr ""
-#~ "failed to set reference. reference id {0} doesn't match history id {1}"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Zvoliť Lambert súradnice"
-
-#~ msgid "Click second Lambert crosspiece for georeferencing\n"
-#~ msgstr ""
-#~ "Kliknite na druhý Lambertov priečnik (crosspiece) pre georeferencing\n"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Vytvoriť bez zvukovej značky pri čítaní GPX."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "až {0} pôvodné"
-#~ msgstr[1] "až {0} pôvodný"
-#~ msgstr[2] "až {0} pôvodných"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Nemôžem čítať súbor ''{0}''.<br> Chyba je: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Vo vrstve sa nachádzajú neuložené {0} zmeny. Nepoužiť zmeny a pokračovať?"
-#~ msgstr[1] ""
-#~ "Vo vrstve sa nachádza neuložená {0} zmena. Nepoužiť zmenu a pokračovať?"
-#~ msgstr[2] ""
-#~ "Vo vrstve sa nachádzajú neuložených {0} zmien. Nepoužiť zmeny a "
-#~ "pokračovať?"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "VAROVANIE: neočakávaný formát z API bázy URL. Presmerovávanie na info, "
-#~ "alebo stránku priebehu pre OSM pôvodné vedú pravdepodobne ku chybe. API "
-#~ "báza URL je: ''{0}''"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr ""
-#~ "<html>Sú nevyriešené konflikty vo vrstve ''{0}''.<br>Najskôr ich vyriešte."
-#~ "<html>"
-
-#~ msgid "{0} object to modifiy:"
-#~ msgid_plural "{0} objects to modify:"
-#~ msgstr[0] "{0} upravený objekt:"
-#~ msgstr[1] "{0} upravené objekty:"
-#~ msgstr[2] "{0} upravených objektov:"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "Vždy posúvať a nezobrazovať znovu dialóg"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "Vyriešiť konflikty verzie pre cestu {0}"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
-#~ "relation?</html>"
-#~ msgstr ""
-#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
-#~ "<br>Delete from relation?</html>"
-#~ msgstr ""
-#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
-#~ "relácie?</html>"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "Vyriešiť konflikty verzie pre bod {0}"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "Vyriešiť konflikty verzie pre reláciu {0}"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr ""
-#~ "VAROVANIE: Neúspešná inicializácia preferencií. Adresár preferencií "
-#~ "''{0}'' nie je adresár."
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>Neúspešná inicializácia preferencií.<br>Adresár preferencií ''{0}'' "
-#~ "nie je adresár.</html>"
-
-#~ msgid "a primitive with id=0 can't be invisible"
-#~ msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
-
-#~ msgid ""
-#~ "tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values"
-#~ msgstr ""
-#~ "kolekcia značiek nemôže byť použitápre pôvodné pretože sú tam kľúče s  "
-#~ "viacnásobnými hodnotami"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Teraz tam nie je otvorený súbor zmien."
-
-#~ msgid "Close the current changeset ..."
-#~ msgstr "Zatváram aktuálny súbor zmien ..."
-
-#~ msgid "Close current changeset"
-#~ msgstr "Zavrieť aktuálny súbor zmien"
-
-#~ msgid "Use a new changeset and close it"
-#~ msgstr "Použite nový súbor zmien a zatvorte ho"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to close the "
-#~ "changeset after the upload"
-#~ msgstr ""
-#~ "Výber pre nahrávanie dát použije nový súbor zmien a zatvorí súbor zmien "
-#~ "po nahratí"
-
-#~ msgid ""
-#~ "Select to upload the data using a new changeset and to leave the "
-#~ "changeset open after the upload"
-#~ msgstr ""
-#~ "Vybrať pre nahratie používaných dát nový súbor zmien a nechať súbor zmien "
-#~ "otvorený aj po nahratí"
-
-#~ msgid "Upload to a new or to an existing changeset?"
-#~ msgstr "Nahrať do nového, alebo existujúceho súboru zmien?"
-
-#~ msgid "Use a new changeset and leave it open"
-#~ msgstr "Použiť nový súbor zmien a nechať to otvoriť"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to leave the changeset "
-#~ "open for further uploads"
-#~ msgstr ""
-#~ "Vybrať nahratie do existujúceho súboru zmien {0} a ponechať súbor zmien "
-#~ "otvorený pre ďalšie nahratia"
-
-#~ msgid "Use the existing changeset {0} and close it after upload"
-#~ msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí"
-
-#~ msgid ""
-#~ "Select to upload to the existing changeset {0} and to close the changeset "
-#~ "after this upload"
-#~ msgstr ""
-#~ "Vybrať pre nahratie existujúci súbor zmien {0} a zavrite súbor zmien po "
-#~ "tomto nahratí"
-
-#~ msgid "Use the existing changeset {0} and leave it open"
-#~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený"
-
-#~ msgid ""
-#~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
-#~ "changeset will automatically be closed by the server after a timeout.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Neúspešné zatváranie súboru zmien ''{0}'' na OSM servery ''{1}''."
-#~ "<br>The súbor zmien bude automaticky zavretý na servery po vypršaní "
-#~ "časového limitu.</html>"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong>"
-#~ msgstr ""
-#~ "<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong> s "
-#~ "<strong>{2}</strong> v súbore zmien <strong>{3}</strong>"
-
-#~ msgid "Changeset {0} is unchanged. Skipping update."
-#~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu."
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..."
-
-#~ msgid "Reusing existing changeset {0}"
-#~ msgstr "Znovu použitý existujúci súbor zmien {0}"
-
-#~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
-#~ msgstr ""
-#~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol "
-#~ "požadovaný. Otvátam nový.."
-
-#~ msgid "Closing changeset {0}..."
-#~ msgstr "Zatváranie súboru zmien {0}..."
-
-#~ msgid ""
-#~ "Failed to update changeset. Either there is no current changeset or the "
-#~ "id of the current changeset is 0"
-#~ msgstr ""
-#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor "
-#~ "zmien, alebo id aktuálneho súboru zmien je 0"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "Nenachádza sa tu súbor zmien pre diff nahratie"
-
-#~ msgid "Leaving changeset {0} open..."
-#~ msgstr "Otváram povolený (leaving) súbor zmien {0}..."
-
-#~ msgid "The key ''{0}'' and all it's values are going to be removed"
-#~ msgstr "Kľúč ''{0}'' a všetky jej hodnoty budú odstránené"
-
-#~ msgid "Please decided which values to keep"
-#~ msgstr "Prosím rozhodnite ktoré hodnoty zachovať."
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Držať sa vašej lokálnej verzie, JOSM<br>má resetnúť id pôvodných "
-#~ "{0} na 0.<br>Pri ďalšom nahrávaní serveru bude priraďovať <br>toto je "
-#~ "nové id.<br>Súhlasíte?</html>"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "poznámka: Pre nejakú úlohu, JOSM potrebuje veľa pamäti. To môže byť "
-#~ "nevyhnutné k pridaniu nasledujúceho\n"
-#~ "      Java nastavenie využitia na maximálnu mieru pridelenej pamäti"
-
-#~ msgid "parameter ''{0}'' must not be empty"
-#~ msgstr "parameter ''{0}'' nemôže byť prázdny"
-
-#~ msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-#~ msgstr ""
-#~ "parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}"
-
-#~ msgid "tag collection doesn't include the selected value ''{0}''"
-#~ msgstr "zbierka značiek neobsahuje vybrané hodnoty ''{0}''"
-
-#~ msgid "not yet decided"
-#~ msgstr "ešte žiadne rozhodnutie"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Výber pôvodných, doplnených týmto používateľom"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr ""
-#~ "<html>Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo<br>chýbalo "
-#~ "v tomto systéme.</html>"
-
-#~ msgid "id > 0 expected, got {0}"
-#~ msgstr "id > 0 očakávaný, got {0}"
-
-#~ msgid "Layer ''{0}'' has no modifications to be saved"
-#~ msgstr "Vrstva ''{0}'' neobsahuje zmeny ktoré, by mali byť uložené"
-
-#~ msgid ""
-#~ "Layer ''{0}'' has modifications which should be saved to its assoicated "
-#~ "file ''{1}''."
-#~ msgstr ""
-#~ "Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté do ich "
-#~ "pridruženého súboru ''{1}''."
-
-#~ msgid "Layer ''{0}'' has no modifications to be uploaded"
-#~ msgstr "Vrstva ''{0}'' neobsahuje zmeny ktoré, by mali byť nahraté"
-
-#~ msgid "Unsafed data non-writable files"
-#~ msgstr "Nezabezpečené dáta nezapisovateľné súbory"
-
-#~ msgid "Unsafed data and missing associated file"
-#~ msgstr "Nezabezpečené dáta a chýbajúci pridružený súbor"
-
-#~ msgid ""
-#~ "<html>{0} layer needs saving but has an associated file<br>which can't be "
-#~ "written.<br>Either select another file for this layer or discard the "
-#~ "changes.<br>Layer with a non-writable file:</html>"
-#~ msgid_plural ""
-#~ "<html>{0} layers need saving but have associated files<br>which can't be "
-#~ "written.<br>Either select another file for each of them or discard the "
-#~ "changes.<br>Layers with non-writable files:</html>"
-#~ msgstr[0] ""
-#~ "<html>{0} vrstvy potrebujú uloženie, ale majú pridružené súbory<br>ktoré "
-#~ "nie sú zapisovateľné.<br>Najskôr vyberte iné súbory pre tieto vrstvy, "
-#~ "alebo zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými "
-#~ "súbormi:</html>"
-#~ msgstr[1] ""
-#~ "<html>{0} vrstva potrebuje uloženie, ale má pridružený súbor<br>ktorý nie "
-#~ "je zapisovateľný.<br>Najskôr vyberte iný súbor pre túto vrstvu, alebo "
-#~ "zrušte zmeny pre túto vrstvu.<br>Vrstva s nezapisovateľným súborom:</html>"
-#~ msgstr[2] ""
-#~ "<html>{0} vrstiev potrebuje uloženie, ale majú pridružené súbory<br>ktoré "
-#~ "nie sú zapisovateľné.<br>Najskôr vyberte iné súbory pre tieto vrstvy, "
-#~ "alebo zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými "
-#~ "súbormi:</html>"
-
-#~ msgid "Unsafed data and conflicts"
-#~ msgstr "Nezabezpečené dáta a konflikty"
-
-#~ msgid "Save and Delete"
-#~ msgstr "Uložiť a Vymazať"
-
-#~ msgid ""
-#~ "<html>An upload and/or save operation of one layer with "
-#~ "modifications<br>was cancelled or has been failed.</html>"
-#~ msgstr ""
-#~ "<html>Nejaká nahrávacia a/alebo ukladacia operácia s vrstvou s "
-#~ "úpravami<br>bola zrušená, alebo bola neúspešná.</html>"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Pripravujem pôvodné na nahratie ..."
-
-#~ msgid ""
-#~ "failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "neúspešné rozloženie poľa ''{1}'' v nastavení s kľúčom ''{0}''. Odchýlka "
-#~ "bola: {2}. Nemôžem obnoviť geometriu okna z nastavení."
-
-#~ msgid ""
-#~ "preference with key ''{0}'' doesn''t provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "nastavenie s kľúčom ''{0}'' nemôžem dodať vnútornú hodnotu pre ''{1}''. "
-#~ "Dodaná {2}. Nemôžem obnoviť geometriu okna z nastavení."
-
-#~ msgid ""
-#~ "preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
-#~ msgstr ""
-#~ "nastavenie s kľúčom ''{0}'' neobsahuje ''{1}''. Nemôžem obnoviť geometriu "
-#~ "okna z nastavení."
-
-#~ msgid ""
-#~ "preference with key ''{0}'' doesn''t exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "nastavenie s kľúčom ''{0}'' neexistuje. Nemôžem obnoviť geometriu okna z "
-#~ "nastavení."
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
-#~ "Ignorujem rozdielne nahrávanie."
-
-#~ msgid ""
-#~ "Warning: failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
-#~ "východziu geometriu. Detaily: {1}"
-
-#~ msgid "Set "
-#~ msgstr "Nastavenie(Set) "
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WML layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Základ URL<br>''{0}''<br>pre túto WML vrstvu neobsahuje na konci "
-#~ "žiadnu z ''&'' ani s ''?''.<br>Toto pravdepodobne vedie k chybnej WMS "
-#~ "požiadavke. Mali by ste skontrolovať vaše<br>nastavenie preferencií."
-#~ "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Tento test kontroluje, že tam nie sú cesty s rovnakými značkami a s "
-#~ "rovnakými suradnicami bodov."
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Kopírovať vybrané vychodzie nastavenia"
-
-#~ msgid "Bikes"
-#~ msgstr "Bicykle"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Vo vrstve sa nachádzajú nevyriešené konflikty ''{0}''.<br>Najskôr "
-#~ "ich vyriešte.</html>"
-
-#~ msgid "Conflicts when merging nodes - merged node is ''{0}''"
-#~ msgstr "Konflikty pri spojovaní bodov - spojovaný bod je ''{0}''"
-
-#~ msgid "can't add node {0} to incomplete way {1}"
-#~ msgstr "nemôžem pridať bod {0} do nedokončenej cesty {1}"
-
-#~ msgid "paramete''{0}'' must not be null"
-#~ msgstr "parameter''{0}'' nesmie byť nula"
-
-#~ msgid "version > 0 expected. Got {0}"
-#~ msgstr "verzia > 0 očakávaná. Got {0}"
-
-#~ msgid "expected id >= 0. Got {0}"
-#~ msgstr "očekávané id >= 0. Got {0}"
-
-#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
-#~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''"
-
-#~ msgid "id > 0 expected. Got {0}"
-#~ msgstr "id > 0 očakávané. Got {0}"
-
-#~ msgid "Replace the way this member refers to with the combined way"
-#~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
-
-#~ msgid "pos {0} is out of range. current number of members: {1}"
-#~ msgstr "pozícia {0} je mimo rozsah. aktuálne číslo z  členov: {1}"
-
-#~ msgid "Tag modified relations with   "
-#~ msgstr "Značka zmenená vzťahmi s   "
-
-#~ msgid "child.getId() >0 expected. Got {1}"
-#~ msgstr "child.getId() >0 očakávaný. Got {1}"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Neplatná poznámka nahrávania"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
-#~ msgstr ""
-#~ "<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong> s "
-#~ "<strong>{2}</strong> v zmenovej sade <strong>{3}</strong></html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>Zväčšenie:</b> Kolieskom myši, dvojklik alebo Ctrl + Hore(Up)/Dole"
-#~ "(Down) <b>Posun mapy:</b> Podržať pravé tlačítko myši a pohnúť myšou, "
-#~ "alebo použiť kurzorové klávesy. <b>Výber:</b> Podržať ľavé tlačítko myši "
-#~ "a nakresliť rám."
-
-#~ msgid "Missing mandatory attribute ''{0}''"
-#~ msgstr "Chýba povinný atribút ''{0}''"
+#~ "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
 #~ msgid ""
 #~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "Chýbajú povinné atribúty v elementoch ''hranice''. Got mindĺžka=''{0}'',"
-#~ "minšírka=''{1}00,maxdĺžka=''{3}'',maxšírka=''{4}'', origin=''{5}''"
-
-#~ msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-#~ msgstr "Chýba povinná vlastnosť ''{0}'' z XML elementu {1}"
-
-#~ msgid "Missing attribute ''ref'' on member in relation {0}"
-#~ msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
-
-#~ msgid "Found XML element <member> not as direct child of element <relation>"
+#~ "Chýbajúce povinné vlastnosti pri prvku ''hranice''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+
+#~ msgid "Changeset"
+#~ msgstr "Zmenový súbor"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu <relácia>"
-
-#~ msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-#~ msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
-
-#~ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-#~ msgstr "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
-
-#~ msgid "found XML element <nd> element not as direct child of element <way>"
+#~ "Varovanie: neočakávané číslo verzie JOSM v opravnom(revision) súbore, "
+#~ "hodnota je ''{0}''"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "vytvoriť XML element <nd> element nie je ako priame dieťa z elementu <way>"
-
-#~ msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-#~ msgstr ""
-#~ "Varovanie: Nedefinovaný element ''{0}'' hľadám vo vstupnom toku. "
-#~ "Vynechanie."
-
-#~ msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
-
-#~ msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-#~ msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
+#~ "Varovanie: neúspešné otvorenie vstupného toku zdroja ''/data/{0}''. "
+#~ "Nemôžem načítať NTF<->RGF93 mriežku"
 
 #~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
-#~ "API version is ''0.5''. Got {1}"
-#~ msgstr ""
-#~ "VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
-#~ "API verziu je ''0.5''. Got {1}"
-
-#~ msgid "Unknown or unsupported API version. Got {0}"
-#~ msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}"
-
-#~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 0, "
-#~ "API version is ''0.6''. Got {1}"
-#~ msgstr ""
-#~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
-#~ "API verzia je ''0.6''. Got {1}"
-
-#~ msgid ""
-#~ "WARNING: normalizing value of attribute ''version'' of element {0} to 1, "
-#~ "API version is ''0.5''. Got {1}"
-#~ msgstr ""
-#~ "VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
-#~ "API verzia je ''0.5''. Got {1}"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-#~ msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
-
-#~ msgid ""
-#~ "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got "
-#~ "{1}"
-#~ msgstr ""
-#~ "Neplatná hodnota pre vlastnosť ''verzia'' na OSM pôvodné s id {0}. Got {1}"
-
-#~ msgid ""
-#~ "way with external id ''{0}'' includes missing node with external id "
-#~ "''{1}''"
-#~ msgstr ""
-#~ "cesta s externým id ''{0}'' obsahuje chýbajúci bod s externým id ''{1}''"
-
-#~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to "
-#~ "version 0.6"
-#~ msgstr ""
-#~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do "
-#~ "verzie 0.6"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''"
-#~ msgstr ""
-#~ "Relácia s externým id ''{0}'' odkazuje na chýbajúce pôvodné s externým id "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-#~ msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
-
-#~ msgid "create new objects"
-#~ msgstr "vytvoriť nové objekty"
-
-#~ msgid "brown"
-#~ msgstr "hnedá"
-
-#~ msgid "black"
-#~ msgstr "čierna"
-
-#~ msgid "white"
-#~ msgstr "biela"
-
-#~ msgid "blue"
-#~ msgstr "modrá"
-
-#~ msgid "red"
-#~ msgstr "červená"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=cesta</b> - kľúč 'type' s presnou hodnotou 'cesta'."
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - kľúč 'type' s nejakou hodnotou. Skúste tiež <b>*=hodnota</"
-#~ "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#~ msgid "Missing attribute ''type'' on member {0} in relation {1}"
-#~ msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Prosím vložte vybraný reťazec"
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "Nothing find in selection by searching for ''{0}''"
-#~ msgstr "Nič sa nenašlo vo výbere počes hľadania pre ''{0}''"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Uplatniť tiež pre deti(children)"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you've been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>Nahrávanie <strong>neúspešné</strong> pretože ste použili<br>súbor "
-#~ "zmien {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať znova s novým, "
-#~ "alebo existujúcimi súbormi zmien."
-
-#~ msgid "Open a new changeset"
-#~ msgstr "Otvoriť nový zmenový súbor"
-
-#~ msgid "Upload data to an already opened changeset"
-#~ msgstr "Nahrať dáta do už otvoreného zmenového súboru"
-
-#~ msgid "Use an open changeset"
-#~ msgstr "Použiť a otvoriť zmenový súbor"
-
-#~ msgid "Upload all changes in one request"
-#~ msgstr "Nahrať všetky zmeny v jednej požiadavke"
-
-#~ msgid "current changeset is null. Can't upload data."
-#~ msgstr "aktuálny zmenový súbor je prázdny. Nemôžem nahrať dáta."
-
-#~ msgid "id of current changeset > required. Current id is {0}"
-#~ msgstr "id z aktuálneho zmenového súboru > požadovaný. Aktuálne id je {0}"
-
-#~ msgid "id of changeset > 0 required. Got {0}"
-#~ msgstr "id zo zmenového súboru > 0 požadovaný. Got {0}"
-
-#~ msgid "parameter ''{0}'' > 0 expected. Got {1}"
-#~ msgstr "parameter ''{0}'' > 0 očakávaný. Got {1}"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
-
-#~ msgid "changeset id > 0 expected. Got {1}"
-#~ msgstr "zmenový súbor id > 0 očekávaný. Got {1}"
-
-#~ msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "chybné číselné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
-
-#~ msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "chybné booleovské hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
-
-#~ msgid "missing mandatory attribute ''{0}''"
-#~ msgstr "chýbajúce povinné vlastnosti ''{0}''"
-
-#~ msgid "illegal value for attribute ''{0}''. Got ''{1}''"
-#~ msgstr "chybné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
-
-#~ msgid "Changeset id > 0 expected. Got {0}"
-#~ msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
-
-#~ msgid "Open changeset expected. Got closed changeset with id {0}"
-#~ msgstr "Otvoriť očakávaný zmenový súbor. Got zavretý zmenový súbor s id {0}"
-
-#~ msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
-#~ msgstr "Chýbajúca vlastnosť ''{0}'' na XML značke(tag) ''{1}''"
-
-#~ msgid "XML tag <user> is missing"
-#~ msgstr "XML značka(tag) <user> chýba"
-
-#~ msgid "Error: failed to add authentication credentials to the connection."
-#~ msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie."
-
-#~ msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
-#~ msgstr ""
-#~ "Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
-
-#~ msgid "Processing {0}"
-#~ msgstr "Spracovávanie {0}"
-
-#~ msgid "Relation: from {0} to {1} via {2}"
-#~ msgstr "Relácia: z {0} do {1} sprostredkujúca(via) {2}"
-
-#~ msgid "{0} extrem nodes."
-#~ msgstr "{0} hraničné(extrem) body."
-
-#~ msgid "Via node {0}, {1}"
-#~ msgstr "Sprostredkujúce(Via) body {0}, {1}"
-
-#~ msgid "{0} via nodes."
-#~ msgstr "{0} Sprostredkujúce(via) body."
-
-#~ msgid "MIddle way: {0}"
-#~ msgstr "Stred(MIddle) cesty: {0}"
-
-#~ msgid "Man-Made"
-#~ msgstr "Človekom-Vytvorené (Man-Made)"
-
-#~ msgid "Cancel closeing of changesets"
-#~ msgstr "Zrušiť zatváranie zmenových súborov"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> "
-#~ "or <A HREF=\"{1}\">váš jazyk</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
-
-#~ msgid "Didn't find an primitive with id {0} in this dataset"
-#~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Základ URL<br>''{0}''<br>pre túto WMS vrstvu neobsahuje na konci "
-#~ "žiadnu z ''&'' ani s ''?''.<br>Toto pravdepodobne vedie k chybnej WMS "
-#~ "požiadavke. Mali by ste skontrolovať vaše<br>nastavenie preferencií."
-#~ "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovedou chýba. Vytvorte to v <A HREF=\"{0}\">English</A> "
-#~ "alebo <A HREF=\"{1}\">váš jazyk</A>."
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitmive ''{1}''"
-#~ msgstr ""
-#~ "Varovanie: vrstva ''{0}'' už viac neexistuje. nemožno odstrániť konflikty "
-#~ "s pôvodnými ''{1}''"
-
-#~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM can''t upload them. Please edit the relations and remove the "
-#~ "cyclic dependency.</html>"
-#~ msgstr ""
-#~ "<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké "
-#~ "iné.<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte "
-#~ "cyklické závislosti.</html>"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "stopa"
-#~ msgstr[1] "stopy"
-#~ msgstr[2] "stopy"
-
-#~ msgid ""
-#~ "Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''"
-#~ msgstr ""
-#~ "VAROVANIE:vrstva ''{0}'' už viac neexistuje. Nemôžete vyriešiť konflikty "
-#~ "pre pôvodné ''{1}''"
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>Nahrávanie <strong>neúspešné</strong> pretože ste "
-#~ "použili<br>zmenový súbor {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať "
-#~ "znova s novým, alebo existujúcim zmenovým súborom.</html>"
-
-#~ msgid "id of current changeset > 0 required. Current id is {0}"
-#~ msgstr "id aktuálneho zmenového súboru > 0 požadovaný. Aktuálny id je {0}"
-
-#~ msgid "All:"
-#~ msgstr "Všetky:"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' nesmie byť nulový"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "neočakávaná hodnota. Dostal {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "očekávané id >= 0. Got {0}"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
-
-#~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr ""
-#~ "kolekcia značiek nemôže byť použitápre pôvodné pretože sú tam kľúče s  "
-#~ "viacnásobnými hodnotami"
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "nenájdená predchádzajúca verzia. História je prázdna."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "nenájdená staršia verzia. História je prázdna."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr ""
-#~ "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "aktuálny parameter je mimo rozsahu: got {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr ""
-#~ "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "neočakávaný index stĺpca. Got {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr ""
-#~ "spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parameter ''{0}'' nemôže byť prázdny"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "zbierka značiek neobsahuje vybrané hodnoty ''{0}''"
-
-#~ msgid "Index out of bounds. Got {0}."
-#~ msgstr "index je mimo hranice Dostať {0}"
-
-#~ msgid "Display the history of the selected primitive."
-#~ msgstr "Zobraziť priebeh z vybraných pôvodných"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "child.getId() >0 očakávaný. Got {1}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Nemôžem čítať \"{0}\""
-
-#~ msgid ""
-#~ "No primitive with id {0} in local dataset. Can't infer primitive type."
-#~ msgstr ""
-#~ "žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ "
-#~ "pôvodných"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Server odpovedal s chybovou kód 404, opakovanie s individuálnou žiadosťou "
-#~ "pre každý pôvodný"
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi"
-
-#~ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-#~ msgstr "chybné číselné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got "
-#~ "''{1}''."
-#~ msgstr ""
-#~ "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
-#~ "''{1}''"
-
-#~ msgid ""
-#~ "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
-#~ msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Nemôžem sa pripojiť k OSM serveru. Prosím skontrolujte si pripojenie k "
-#~ "internetu."
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
-#~ "Ignorujem rozdielne nahrávanie."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not include ''{1}''. Can''t restore "
-#~ "window geometry from preferences."
-#~ msgstr ""
-#~ "nastavenie s kľúčom ''{0}'' neobsahuje ''{1}''. Nemôžem obnoviť geometriu "
-#~ "okna z nastavení."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not provide an int value for ''{1}''. "
-#~ "Got {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "nastavenie s kľúčom ''{0}'' nemôžem dodať vnútornú hodnotu pre ''{1}''. "
-#~ "Dodaná {2}. Nemôžem obnoviť geometriu okna z nastavení."
-
-#~ msgid ""
-#~ "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception "
-#~ "was: {2}. Can''t restore window geometry from preferences."
-#~ msgstr ""
-#~ "neúspešné rozloženie poľa ''{1}'' v nastavení s kľúčom ''{0}''. Odchýlka "
-#~ "bola: {2}. Nemôžem obnoviť geometriu okna z nastavení."
-
-#~ msgid ""
-#~ "Preference with key ''{0}'' does not exist. Can''t restore window "
-#~ "geometry from preferences."
-#~ msgstr ""
-#~ "nastavenie s kľúčom ''{0}'' neexistuje. Nemôžem obnoviť geometriu okna z "
-#~ "nastavení."
-
-#~ msgid ""
-#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
-#~ "to default geometry. Details: {1}"
-#~ msgstr ""
-#~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
-#~ "východziu geometriu. Detaily: {1}"
-
-#~ msgid ""
-#~ "Marked way {0} with {1} nodes incomplete because at least one node was "
-#~ "missing in the loaded data and is therefore incomplete too."
-#~ msgstr ""
-#~ "Značená cesta {0} s {1} bodmi je neúplná pretože aspoň jeden bod bol "
-#~ "chýbajúci v nahratých dátach a je preto neúplná tiež."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr ""
-#~ "Varovanie: Vrstva ''{0}'' už viac neexistuje. Nemôžem odstrániť konflikt "
-#~ "s pôvodnými ''{1}''."
-
-#~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr ""
-#~ "Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
-#~ "nastavení synchronizácie."
-
-#~ msgid ""
-#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-#~ "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-#~ msgstr ""
-#~ "Chýbajúce povinné vlastnosti prvku ''hranice''. Got mindĺžka=''{0}'',"
-#~ "minšírka=''{1}00,maxdĺžka=''{3}'',maxšírka=''{4}'', origin=''{5}''."
-
-#~ msgid ""
-#~ "Relation with external id ''{0}'' refers to missing primitive with "
-#~ "external id ''{1}''."
-#~ msgstr ""
-#~ "Relácia s externým id ''{0}'' odkazuje na chýbajúce pôvodné s externým id "
-#~ "''{1}''."
-
-#~ msgid "Travel"
-#~ msgstr "Cestovanie"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Zobrazuje obrázky s informáciou o polohe ako pozadie v JOSMe (WMS "
-#~ "servery, Yahoo, ...)."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. "
-#~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Zobrazuje slippy map sieť v JOSMe. Môžete nahrať dlaždice zo slippy map "
-#~ "ako pozadie a požiadať aktualizáciu."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu."
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Povoľuje používateľom vytvorenie rozdielnych farebných schém a prepínanie "
-#~ "medzi nimi. Iba zmena farieb a vytvoriť novú schému. Použiť prepínač na "
-#~ "biele pozadie so zodpovedajúcimi farbami pre lepšiu viditeľnosť pri "
-#~ "jasnom slnečnom svetle. Pozrieť dialóg v JOSM nastaveniach a 'Map Settings"
-#~ "(nastavenia mapy' (divné, ale pravdivé :-)"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Očistený objekt ''{0}''"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nemôžem obnoviť(undo) príkaz ''{0}'' pretože vrstva ''{1}'' už viac nie "
-#~ "je prítomná."
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
-#~ "pôvodných a zopakovanie nahratia."
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Vybranie odkazu z relácie {0}"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "Očistené {0} objekty"
-
-#~ msgid ""
-#~ "{0} object has been purged from the local dataset because it is deleted "
-#~ "on the server."
-#~ msgid_plural ""
-#~ "{0} objects have been purged from the local dataset because they are "
-#~ "deleted on the server."
-#~ msgstr[0] ""
-#~ "{0} objekt bol očistený z lokálneho dátového súboru, pretože je zmazaný "
-#~ "na servery."
-#~ msgstr[1] ""
-#~ "{0} objekty boli očistené z lokálneho dátového súboru, pretože sú zmazané "
-#~ "na servery."
-#~ msgstr[2] ""
-#~ "{0} objektov bolo očistených z lokálneho dátového súboru, pretože sú "
-#~ "zmazané na servery."
-
-#~ msgid "tower"
-#~ msgstr "veža"
-
-#~ msgid "any substance"
-#~ msgstr "nejaké látky(any substance)"
-
-#~ msgid "underwater"
-#~ msgstr "podvodné(underwater)"
-
-#~ msgid "overground"
-#~ msgstr "nadzemné(overground)"
-
-#~ msgid "minor_line"
-#~ msgstr "vedľajšie_vedenie"
-
-#~ msgid "line"
-#~ msgstr "vedenie"
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
-#~ "update, or delete. Either the respective object<br>doesn''t exist on the "
-#~ "server or you''re using an invalid URL to access<br>it. Please carefully "
-#~ "check the servers address ''{1}'' for typos."
-#~ msgstr ""
-#~ "The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
-#~ "update, or delete. Either the respective object<br>doesn''t exist on the "
-#~ "server or you''re using an invalid URL to access<br>it. Please carefully "
-#~ "check the servers address ''{1}'' for typos."
-
-#~ msgid "No type found. History is empty."
-#~ msgstr "Typ nenájdený. História(priebeh) je prázdna."
-
-#~ msgid "longitude"
-#~ msgstr "zemepisná dĺžka"
-
-#~ msgid "latitude"
-#~ msgstr "zemepisná šírka"
-
-#~ msgid "Coordinate"
-#~ msgstr "Súradnice"
-
-#~ msgid ""
-#~ "The OSM server ''{0}'' doesn''t know about an object<br>you tried to "
-#~ "read, update, or delete. Either the respective object<br>doesn''t exist "
-#~ "on the server or you''re using an invalid URL to access<br>it. Please "
-#~ "carefully check the servers address ''{0}'' for typos."
-#~ msgstr ""
-#~ "OSM server ''{0}'' nepozná objekt<br>pokúsili ste sa čítať, aktualizovať, "
-#~ "alebo vymazať. Jeden príslušný objekt<br>neexistuje na servery, alebo "
-#~ "používate chybnú URL pre prístup<br>naň. Prosím opatrne skontrolujte "
-#~ "adresy serverov ''{0}'' kvôli preklepom."
-
-#~ msgid "Update selections"
-#~ msgstr "Aktualizovať výbery"
-
-#~ msgid "Updates the objects in the current data layer from the server."
-#~ msgstr "Aktualizovať objekty v aktuálnej dátovej vrstvy zo servera."
-
-#~ msgid ""
-#~ "Upload all changes in the current current selection to the OSM server."
-#~ msgstr "Nahrať všetky zmeny v aktuálnom výbere na OSM server"
-
-#~ msgid "Upload all changes in the current data layer to the OSM server"
-#~ msgstr "Nahrať všetky zmeny v aktuálnej dátovej vrstve na OSM server"
-
-#~ msgid ""
-#~ "Please consult the Conflict List Dialog<br>and manually resolve them."
-#~ msgstr "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Údaje obsahujú chyby. Aj napriek tomu ich nahrať?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Opraviť označené chyby."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Nabudúce ignorovať označené chyby."
-
-#~ msgid "Help / About"
-#~ msgstr "Nápoveda / o programe"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Nastala výnimka/chyba"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Varovanie: Základná URL ''{0}'' pre a WMS službu neobsahuje koncový '&' "
-#~ "alebo koncový '?'."
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Duplikovať cesty s rozostupom/vzdialenosťou"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Vyberte ak dáta majú byť stiahnuté na novú vrstvu"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Nemôže byť nájdený objekt s id {0} v aktuálnej dátovej sade"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "Preidaných {0} objektov"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Asi ste spustili {0} okná(ien) prehliadača.<br>Toto môže zaplniť vašu "
-#~ "obrazovku s oknom prehliadača<br>a spôsobiť ukončenie po nejakej dobe."
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Nahrávam {0} objekty(ov) ..."
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "Zlý počet údajov(parametrov) pre operátor značiek."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Údaj(parameter) ''{0}'' nesmie byť prázdny"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "Nesprávna hodnota z operátora značiek: {0}. Operátor značiek očakáva "
-#~ "číslo zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Nedovolená zdvojená hodnota ''{0}''"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr "Nesprávne načítanie čítacieho prostriedku ''{0}''. Chyba je {1}"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr ""
-#~ "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v obsahu "
-#~ "záložiek zo servera"
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>Aktuálne sťahovaná oblasť</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-
-#~ msgid "The string ''{0}'' isn''t a valid double value."
-#~ msgstr "Reťazec ''{0}'' nie je platný, zdvojená hodnota."
-
-#~ msgid "Warning: bad location in HTML document. Exception was: "
-#~ msgstr "Varovanie: zlé umiestnenie v HTML dokumente. Výnimka bola: "
-
-#~ msgid "Failed to launch the external help browser"
-#~ msgstr "Neúspešné spustenie externého prehliadača pre pomoc"
-
-#~ msgid "Failed to read command. Exiting help browser. Exception was:"
-#~ msgstr ""
-#~ "Neúspešné načítanie príkazu. Ukončujem prehliadač pre pomoc. Výnimka bola:"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Žiadny <strong>{0}</strong> ani <strong>{1}</strong> je umožnený."
-#~ "<br>Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba."
-#~ "</html>"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Dostupné štýly (z {0})"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Pridať názov súboru, alebo URL z aktívnych štýlov"
-
-#~ msgid "Active styles"
-#~ msgstr "Aktívne štýly"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} Plugin úspešne stiahnutý."
-#~ msgstr[1] "{0} Pluginy úspešne stiahnuté."
-#~ msgstr[2] "{0} Pluginov úspešne stiahnutých."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Prosím reštartujte JOSM."
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Multipolygón sa musí skladať iba z uzavretých ciest."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Musíte vybrať aspoň dve cesty."
-
-#~ msgid "Set manually the Lambert zone"
-#~ msgstr "Manuálne nastaviť Lambert zone"
-
-#~ msgid "Unconnceted coastline"
-#~ msgstr "Nepripojená pobrežná čiara"
-
-#~ msgid "gray"
-#~ msgstr "šedá"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Minimálna vrstva priblíženia: "
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Ťahať diel cesty, pre vytvorenie obdĺžniku. Ctrl+ťahať, pre posunutie "
-#~ "dielu pozdĺž jeho normály."
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr ""
-#~ "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden "
-#~ "objekt"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Chýba zlúčujúci ciel pre objekt s id {0}"
-
-#~ msgid "null detected in node list"
-#~ msgstr "prázdny zoznam bodov"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>Neúspešné otvorenie stránky pomoci z url {0}.<br>Je to "
-#~ "pravdepodobne spôsobené problémom v sieti, prosím skontrolujte "
-#~ "váš<br>vaše internetové pripojenie</html>"
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Kliknite pre zmazanie. Shift: zmaže segment cesty. Alt: zmaže cestu, ale "
-#~ "nemaže body. CTRL: zmaže referenčné objekty."
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr "Kliknutie navráti editor relácie a pokračuje v editovaní relácie"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Kliknutím stiahnete aktuálne vybratú oblasť"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Vytvorenie multipolygónov na jedno kliknutie, o mnoho ľahšie, ako "
-#~ "obvyklou cestou cez editor relácií."
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -48776,772 +44089,61 @@
 
 #~ msgid ""
-#~ "Can''t merge because either of the participating primitives is new and "
-#~ "the other is not"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Nemôžem spojiť, pretože jeden zo zúčastnených pôvodných je nový a druhý "
-#~ "nie je"
-
-#~ msgid "User with the same uid but different name found"
-#~ msgstr "Vytvorený užívateľ s rovnakým uid, ale rozdielnym menom"
+#~ "<html>Okrem iného môžete vložiť <strong>adresu dlaždíc</strong> pre "
+#~ "jednotlivé dlaždice vo formáte<i>zoomlevel/x/y</i>, i.e. <i>15/256/223</"
+#~ "i>. Adresa dlaždíc vo formáte <i>zoom,x,y</i> alebo <i>zoom;x;y</i> sú "
+#~ "tiež platné.</html>"
 
 #~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Can''t deal with this "
-#~ "inconsistency. Keeping target object. "
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Cieľový objekt s id {0} a verziou {1} je viditeľný aj keď zdrojový objekt "
-#~ "s nižšou verziou {2} nie je viditeľný. Nemôžem sa zaoberať s touto "
-#~ "nezrovnalosťou. Ponechávam cieľový objekt. "
+#~ "Varovanie: ignorujem výnimku, pretože úloha bola zrušená. Výnimka bola: "
+#~ "{0}"
 
 #~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "Nemôžem porovnať pôvodné s ID ''{0}'' s pôvodným s ID ''{1}''."
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Nahrávanie /alebo ukladacia operácia z jednej vrstvy s "
+#~ "úpravami<br>bola zrušená alebo skončila neúspechom.</html>"
+#~ msgstr[1] ""
+#~ "<html>Nahrávanie /alebo ukladacie operácie z {0} vrstiev s "
+#~ "úpravami<br>boli zrušené alebo skončili neúspechom.</html>"
+#~ msgstr[2] ""
+#~ "<html>Nahrávanie /alebo ukladacie operácie z {0} vrstiev s "
+#~ "úpravami<br>boli zrušené alebo skončili neúspechom.</html>"
 
 #~ msgid ""
-#~ "<html>The combined ways are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the combined way or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the combined way will "
-#~ "take the place of the original way in the membership.</html>"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "<html>Spojené cesty sú členmi v jednej, alebo viacerých reláciách. Prosím "
-#~ "rozhodnite, či chcete <strong>zachovať</strong> tieto členstvá pre "
-#~ "spojenú cestu, alebo či chcete <strong>odstrániť</strong> ich."
-#~ "<br>Štandardne je <strong>zachovať</strong> ich: spojená cesta zaujme "
-#~ "miesto pôvodnej cesty v členoch.</html>"
+#~ "<html>Sú tam <strong>viacnásobné zmenové súbory</strong> je potrebné "
+#~ "určiť poradie pre nahratie {0} objektov. Ktorú stratégiu chcete použiť?</"
+#~ "html>"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Vždy aktualizovať bez opýtania"
 
 #~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the target node or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the target node will "
-#~ "take the place of the original node in the membership.</html>"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "<html>Združené body sú členmi v jednej, alebo viacerých reláciách. Prosím "
-#~ "rozhodnite, či chcete <strong>zachovať</strong> tieto členstvá pre "
-#~ "cieľový bod, alebo či chcete <strong>odstrániť</strong> ich."
-#~ "<br>Štandardne je <strong>zachovať</strong> ich: cieľový bod zaujme "
-#~ "miesto pôvodného bodu v členoch.</html>"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (France)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 North Geodesic system"
-
-#~ msgid "Downloading relation ''{0}''"
-#~ msgstr "Sťahovanie relácie ''{0}''"
-
-#~ msgid "Could not create a node with the entered latitude/longitude."
-#~ msgstr "Nemôžem vytvoriť body so vstupnými súradnicami šírka/dĺžka."
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Pohľad celá obrazovka"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Prepínač pohľadu na celej obrazovke"
-
-#~ msgid "Illegal lat/lon value"
-#~ msgstr "Neplatná širka/dĺžka hodnota"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
-#~ "objektu<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
-#~ msgstr[1] ""
-#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
-#~ "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
-#~ msgstr[2] ""
-#~ "{0} konflikt bol <strong>vyriešený automaticky</strong> vyčistením {0} "
-#~ "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "{0} zvyšok konfliktu musí byť vyriešený.<br><br>Prosím otvorte Conflict "
-#~ "List Dialog a manuálne ho vyriešte."
-#~ msgstr[1] ""
-#~ "{0} zvyšky konfliktov musia byť vyriešené.<br><br>Prosím otvorte Conflict "
-#~ "List Dialog a manuálne ich vyriešte."
-#~ msgstr[2] ""
-#~ "{0} zvyšov konfliktov musí byť vyriešených.<br><br>Prosím otvorte "
-#~ "Conflict List Dialog a manuálne ich vyriešte."
-
-#~ msgid ""
-#~ "You updated your JOSM software.\n"
-#~ "To prevent problems the plugins should be updated as well.\n"
-#~ "Update plugins now?"
+#~ "Nastala chyba pri rozkladaní gpx súboru {0}. Iba časť súboru bude k "
+#~ "dispozícii"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
 #~ msgstr ""
-#~ "Aktualizovali ste váš JOSM software.\n"
-#~ "K zabráneniu problémov, by ste mali aktualizovať aj pluginy.\n"
-#~ "Aktualizovať pluginy teraz?"
-
-#~ msgid "Looking up available translations..."
-#~ msgstr "Vyhľadávanie dostupných prekladov..."
-
-#~ msgid ""
-#~ "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-#~ "developed and very likely will produce errors.<br>It should be disabled."
-#~ "<br>Delete from preferences?</html>"
-#~ msgstr ""
-#~ "<html>Počet {0} pluginov bolo požadovaných.<br>Tento plugin nie je "
-#~ "naďalej vyvíjaný a veľmi pravdepodobne  bude spôsobovať chyby.<br>Mal by "
-#~ "byť vyradený.<br>Zmazať z nastavení?</html>"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Prosím vložte platnú zemepisnú dĺžku v rozsahu -90..90"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Prosím vložte platnú zemepisnú šírku v rozsahu -90..90"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Prosím vložte zemepisnú dĺžku v rozsahu -90..90"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Očakávaná dĺžka sady 4. dostal som {0}"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Zatvorte dialóg, nevytvorte nový bod"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "vyžadované Id > 0, dostal som {0}"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Objekt id > 0 očakávaný. Dostal som {0}"
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "id s parametrom ''{0}'' > 0 očakávaný. dostal som {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Parameter ''{0}'' > 0 očakávaný. Dostal som {1}."
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože "
-#~ "body cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</"
-#~ "html>"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}"
-
-#~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr ""
-#~ "Nemožno zlúčiť pôvodné s rozdielnymi id. Toto id je {0}, druhé je {1}"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-#~ "server.<br>Because its way points don''t include a timestamp we can''t "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože "
-#~ "body cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami.</html>"
-
-#~ msgid "You've encountered a bug in JOSM"
-#~ msgstr "Stretli ste sa s chybou v JOSMe"
-
-#~ msgid ""
-#~ "<html><p>Alternatively if that doesn't work you can manually fill in the "
-#~ "information<br>below at this URL:</p></html>"
-#~ msgstr ""
-#~ "<html><p>Ak to nefunguje, môžete ručne naplniť zprávu<br>dole v tejto URL:"
-#~ "</p></html>"
-
-#~ msgid "Loading available locales..."
-#~ msgstr "Nahrávam dostupné likality..."
-
-#~ msgid ""
-#~ "<html><p>You've encountered an error in JOSM. Before you file a "
-#~ "bug<br>make sure you've updated to the latest version of JOSM here:</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Stretli ste sa s nejakou chybou v JOSMe. Predtým ako pošlete "
-#~ "správu s chybou<br>uistite sa, že ste tu aktualizovali na poslednú verziu "
-#~ "JOSMu:</p></html>"
-
-#~ msgid ""
-#~ "<html><p>There the the error information provided below should already "
-#~ "be<br>filled out for you. Please include information on how to "
-#~ "reproduce<br>the error and try to supply as much detail as possible.</p></"
-#~ "html>"
-#~ msgstr ""
-#~ "<html><p>Táto chybová správa, poskytnutá dolu, by už mala byť<br>vyplnená "
-#~ "vami. Prosím vložte správu, kde sa opakuje<br>chyba a skúste napísať "
-#~ "podľa možností viac detailov.</p></html>"
-
-#~ msgid ""
-#~ "<html>You should also update your plugins. If neither of those help "
-#~ "please<br>file a bug in our bugtracker using this link:</p></html>"
-#~ msgstr ""
-#~ "<html>Mali by ste tiež aktualizovať vaše pluginy. Ak nič z tohto nepomôže "
-#~ "prosím<br>pošlite súbor s chybou v našom bugtracker použitím tohto linku:"
-#~ "</p></html>"
-
-#~ msgid "Checking translation for locale ''{0}''"
-#~ msgstr "Kontrolujem preklady pre lokality ''{0}''"
-
-#~ msgid "Checking locales..."
-#~ msgstr "Kontrolujem lokality..."
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: Sťahovanie relácie ''{2}''..."
-
-#~ msgid "({0}/{1}) Uploading {2} objects..."
-#~ msgstr "({0}/{1}) Nahrávanie {2} objektov..."
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
-
-#~ msgid "Plugin {0} is no longer necessary and has been deactivated."
-#~ msgstr "Plugin {0} nie je viac potrebný a má byť deaktivovaný."
-
-#~ msgid "Delete old plugin file {0}"
-#~ msgstr "Zmazať staršie súbory pluginov {0}"
-
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Zmazať staršie pluginy {0}"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Nemôžem otvoriť adresár.<br>Prosím vyberte súbor!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Otváram {0} súbory..."
-
-#~ msgid "Missing right parenthesis"
-#~ msgstr "Chýbajúca pravá zátvorka"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.."
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Varovanie: Vrstva ''{0}'' už viac neexistuje. Nemôžem odstrániť konflikt "
-#~ "s pôvodnými ''{1}''."
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Cieľový objekt s id {0} a verziou {1} je viditeľný aj keď zdrojový objekt "
-#~ "s nižšou verziou {2} nie je viditeľný. Nemôžem sa zaoberať s touto "
-#~ "nezrovnalosťou. Ponechávam cieľový objekt. "
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
-
-#~ msgid ""
-#~ "<html>You did not finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>You didn''t finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions won't be applied unless all differences<br>are "
-#~ "resolved.Click <strong>{0}</strong> to close anyway."
-#~ "<strong>Already<br>resolved differences won't be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
-#~ "html>"
-
-#~ msgid "Download Object"
-#~ msgstr "Stiahnuť objekt"
-
-#~ msgid "Download Object..."
-#~ msgstr "Sťahujem objekt..."
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Kopírované dáta obsahujú nekompletné pôvodné. Keď vložíte nekompletné "
-#~ "pôvodné budú odstránené. Chcete vložiť dáta bez nekompletných pôvodných?"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Obnovený {0} pôvodný"
-#~ msgstr[1] "Obnovené {0} pôvodné"
-#~ msgstr[2] "Obnovených {0} pôvodných"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>Vrstva ''{0}'' obsahuje konflikt pôvodných<br>''{1}''.<br>Tento "
-#~ "konflikt nemôže byť nevyriešený.</html>"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Nasledujúce pôvodné nemohli byť kopírované do cieľových "
-#~ "pôvodných<br>pretože boli vymazané v cieľovom zmenovom súbore:"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Nachádza sa tam {0} ďalší pôvodný odkazujúci na reláciu {1}<br>ktorý je "
-#~ "vymazaný na servery.<br><br>Chcete obnoviť tento bod tiež?"
-#~ msgstr[1] ""
-#~ "Nachádza sa tam {0} ďalších pôvodných odkazujúcich na reláciu {1}"
-#~ "<br>ktoré sú vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-#~ msgstr[2] ""
-#~ "Nachádzajú sa tam {0} ďalšie pôvodné odkazujúce na reláciu {1}<br>ktoré "
-#~ "sú vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Nachádza sa tam {0} ďalší bod použitý v ceste {1}<br>ktorý je vymazaný na "
-#~ "servery.<br><br>Chcete obnoviť tento bod tiež?"
-#~ msgstr[1] ""
-#~ "Nachádza sa tam {0} ďalších bodov použitých v ceste {1}<br>ktoré sú "
-#~ "vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-#~ msgstr[2] ""
-#~ "Nachádzajú sa tam {0} ďalšie body použité v ceste {1}<br>ktoré sú "
-#~ "vymazané na servery.<br><br>Chcete obnoviť tieto body tiež?"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Spojenie vymazaných pôvodných neúspešné"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Stiahnuť a zobraziť históriu vybratých pôvodných"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Zväčšiť na zodpovedajúce pôvodné v aktuálnej dátovej vrstve"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Zväčšiť na pôvodné v obsahu zmenového súboru v aktuálnej dátovej vrstve"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Nastavili ste prázdnu funkciu na {0} pôvodnom."
-#~ msgstr[1] "Nastavili ste prázdnu funkciu na {0} pôvodých."
-#~ msgstr[2] "Nastavili ste prázdnu funkciu na {0} pôvodých."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Toto sa rovná vymazaniu funkcií týchto pôvodných."
-
-#~ msgid "GPS point"
-#~ msgstr "GPS bod"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Obsah pomoci pre chýbajúcu tému pomoci</"
-#~ "p><p class=\"warning-body\"> Obsah pomoci pre tému pomoci <strong>{0}</"
-#~ "strong> nie je už dostupná. Je to chýbajúce v oboch vašich miestnych "
-#~ "jazykoch ({1}) a aj v angličtine.<br><br>Pomôžte prosím pri zlepšení "
-#~ "systému pomoci JOSMu a doplňte chýbajúce informácie. Oboje môžete upraviť "
-#~ "pre <a href=\"{2}\">tému pomoci vo vašom miestnom jazyku ({1})</a> a v <a "
-#~ "href=\"{3}\">táme pomoci v angličtine</a>.</p></html>"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Prosím, zadajte svoje OSM užívateľské meno a heslo. Heslo <strong> nebude "
-#~ "</ strong> uložené vo formáte obyčajného textu v JOSM nastaveniach a bude "
-#~ "predložené na server OSM <strong> iba raz </ strong>. Pri nasledujúcej "
-#~ "žiadosti o nahratie údajov  už viac nepoužívajte heslo."
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong> Upozornenie: </ strong> Heslo je prevedené <strong> raz </ "
-#~ "strong> v textovej forme na webových stránkach OSM. <strong> Nepoužívajte "
-#~ "</ strong> citlivé heslo na OSM server poskytuje šifrovaný komunikačný "
-#~ "kanál (HTTPS)."
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Upozornenie: Nemožno pochopiť Mappaint štýly z' '{0}''. Výnimka bola: {1}"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Varovanie: žiadne nastavenie ''{0}'' sa nenašlo."
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Broken tagging preset \"{0}-{1}\" - počet položiek na zobrazení hodnôt, "
-#~ "musí byť rovnaký ako v hodnotách"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html> Nemôžem nahrať plugin {0}, pretože plugin <br> hlavnej "
-#~ "triedy''{1}'' nebol nájdený. <br> Odstrániť z nastavení?"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Bod na rohu budovy, na začiatok kreslenia"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Bod na opačnom konci budovy"
-
-#~ msgid "Set width of building"
-#~ msgstr "Nastaviť šírku budov"
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automaticky vyberte najprv WMS vrstvu pre zachytávanie(grabing), ak "
-#~ "existuje viac vrstiev."
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Táto funkcia vyžaduje (aspoň) jednu špeciálnu vrstvu budov\n"
-#~ "katastra nehnuteľností(Fr) a dátovú vrstvu OSM."
-
-#~ msgid "Grab buildings"
-#~ msgstr "Zachytiť(grab) budovy"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Získať budovy kliknutím (iba vektorové obrázky)"
-
-#~ msgid "tagged"
-#~ msgstr "značkované"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Iba vrstva zachytávaných budov"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Nahrať kalibračné dáta do súboru"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Obrázok nie je správne vytvorený."
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Upozornenie: plugin zákaz odbočenia nahradí už existujúci akciu ''{0}'' "
-#~ "za skratku ''{1}'' akcií ''{2}''"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Zákaz odbočenia používa OSM cestu<span class = \"object-name\">{0}</"
-#~ "span>s funkciou<tt>z</tt> <strong>a</strong> s funkcoiu <tt>na</tt>. "
-#~ "Avšak v zákaze odbočenia, cesta s funkciou <tt> z</tt> by mala byť "
-#~ "odlišná od cesty s funkcoiu <tt> na</tt>."
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Vložiť 'via(cez)' objekty zo schránky"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "OSM cesta s funkciou <tt>na</tt>, je potrebná v zákaze odbočenia."
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "Choďte prosím do Základného editora a ručne vyberte OSM cestu."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr "OSM cesta s funkciou <tt>z</tt>, je potrebná v zákaze odbočenia."
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Pridať OSM cesty s funkciou ''z''"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Pridať OSM cesty s funkciou ''na''"
-
-#~ msgid "Splits the way"
-#~ msgstr "Rozdeliť cestu"
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "<strong>Z</strong>-cesty <span class=\"object-name\">{0}</span> a "
-#~ "<strong>na</strong>-cestu <span class=\"object-name\">{1}</span> "
-#~ "pripojené v bode <span class=\"object-name\">{2}</span> ale <span class="
-#~ "\"object-name\">{2}</span> nie je <strong>via(cez)</strong>-objekt.<br> "
-#~ "Je odporúčané nastaviť <span class=\"object-name\">{2}</span> ako "
-#~ "jedinečný <strong>via(cez)</strong>-objekt."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Prejdite do Základného Editora a vyberte OSM cestu"
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "OSM cesta <span class=\"object-name\">{0}</span> s funkciou <tt>{1}</tt> "
-#~ "by mala byť rozdelená v bode <span class=\"object-name\">{2}</span>, kde "
-#~ "sa napája na cestu <span class=\"object-name\">{3}</span>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Zákaz odbočenia používa body OSM <span class=\"object-name\">{0}</span> "
-#~ "ako členov s funkciou <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Zákaz odbočenia používa relácie OSM <span class=\"object-name\">{0}</"
-#~ "span> ako členov s funkciou <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Tento test zistí, viacjazyčné objekty, ktorých atribút 'meno' nie je "
-#~ "rovnaký s niektorým 'menom: *' atribútu, a nie sú zložené z 'mena: *' "
-#~ "atribútu, napr. Italia - Taliansko - Taliansko."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Vnútorná cesta multipolygónu je vonku."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "Multipolygón bez cesty."
-
-#~ msgid ""
-#~ "The turnrestrictions plugin allows to create and edit turn restrictions "
-#~ "in the OpenStreetMap database."
-#~ msgstr ""
-#~ "Plugin zákaz odbočenia umožňuje vytvárať a upravovať obmedzenia v jazde v "
-#~ "databáze OpenStreetMap."
-
-#~ msgid "mountain_hiking"
-#~ msgstr "horská_turistika"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "náročná_vysokohorská_turistika"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "ťažká_vysokohorská_turistika"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "náročná_horská_turistika"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "vysokohorská_turistika"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>odvodená relácia<br>{0}<br>je na servery zmazaná.Nemôže byť "
-#~ "načítaná."
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Chybne špecifikovan0 ID. Nemôžem stiahnuť objekt."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Chystáte sa zmazať neúplné objekty.<br> To spôsobí problémy, pretože "
-#~ "nevidíte skutočný objekt.<br>Naozaj ich chcete zmazať?"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "Nemožno čítať automaticky uložené OSM udaje ({0}) - {1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Objekt typu {0} s id {1} bol označený na zmazanie, ale chýba v zdrojovom "
-#~ "súbore údajov"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr "Konflikt vo 'viditeľnom' atribúte pre objekt typu {0} s id {1}"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr "Vyzerá to, že JOSM minule havaroval. Chcete obnoviť dáta?"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Umožňuje meniť označenie bodov stopy(track)."
-
-#~ msgid "Internal style"
-#~ msgstr "Interné štýly"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Spustiť prehliadač s wiki pomocníkom pre vybraný objekt"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Dostupné štýly (od {0}):"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Výškový profil trate pre '"
-
-#~ msgid "Apply all guesses"
-#~ msgstr "Použiť všetky odhady"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "Select in map"
-#~ msgstr "Vyberte na mape"
-
-#~ msgid "Guess street names"
-#~ msgstr "Odhad názvu ulice"
-
-#~ msgid "Guess address data"
-#~ msgstr "Odhad hodnoty adries"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Zmeniť vlastnosti 1. objektu"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr "Máte {0} vybraných prvkov. Ale môžete upravovať iba jeden prvok!"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Projekcia ''{0}'' nebola nájdená"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Vyberte prosím aspoň dva body na zlúčenie, alebo bod, ktorý je blízko pri "
-#~ "inom bode."
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "Zadajte súradnice nového bodu. <br/> Môžete oddeliť zemepisnú dĺžku a "
-#~ "šírku s medzerou, čiarkou alebo bodkočiarkou. <br/> Pomocou kladných "
-#~ "čísel, alebo N, E znaky na označenie severného, alebo východného smeru. "
-#~ "<br/> Južné a západné smery môžete použiť buď záporné čísla alebo S, W "
-#~ "znaky <br/> Hodnota súradnice môže byť v jednom z troch formátov: "
-#~ "<ul><li><i>stupňov</i><tt>&deg;</tt></li><li><i>stupňov</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>stupňov</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Nepomenovaná WMS vrstva"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Táto vrstva nepodporuje žiadnu z projekcií pre JOSM,\n"
-#~ "takže ju nemôžete používať. Táto správa nebude znova zobrazovaná."
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "Vstavaný štýl, Vnútorná cesta: </ b>"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Najlepší zoom: {0}"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Zobraziť zoom: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Aktuálny zoom: {0}"
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Nižšie sú uvedené výsledky automatickej validácie. Skúste opraviť chyby, "
-#~ "ale buďte opatrní (neničte platné dáta). Ak ste na pochybách ignorujte "
-#~ "ich. <br> Keď zrušíte tento dialóg, môžete nájsť položky a prezerať ich v "
-#~ "paneli validátor."
+#~ "Prológ dokumentu OsmChange ešte nebol napísaný. Najskôr ho prosím napíšte."
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Otvoriť editor pre vybrané zákazy odbočenia"
+
+#~ msgid "Both"
+#~ msgstr "Oba"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 26529)
+++ applications/editors/josm/i18n/po/sv.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-19 16:29+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:42+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:41+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorerar ogiltig fil-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "Varning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametern \"downloadgps\" godtar inte filnamn eller fil URL:er."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "kompatibel) version av JOSM.</li></ul>Mer information:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Avsluta JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Fortsätt, försök i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -389,6 +390,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -415,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -421,7 +422,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -429,5 +431,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -638,5 +640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -888,5 +890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -895,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1081,6 +1083,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1231,5 +1233,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1458,6 +1460,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2130,5 +2132,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2452,7 +2454,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Hämta data"
@@ -2705,6 +2707,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "Ignorerar undantag eftersom hämtningen avbrutits. Undantaget var: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2841,10 +2843,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3007,5 +3009,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3616,5 +3618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3665,40 +3667,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Radera \"{0}\" för nod \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Radera \"{0}\" för sträcka \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Radera \"{0}\" för relation \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Sätt {0}={1} för nod \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Sätt {0}={1} för sträcka \"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Sätt {0}={1} för relation\"{2}\""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Radera \"{0}\" från {1} objekt"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3823,4 +3825,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Bekräfta borttagning"
@@ -4123,6 +4126,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4159,7 +4162,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Varning: Oväntad versions nummer för JOSM i revisionsfilen, värdet är ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4266,5 +4268,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4366,5 +4368,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4383,8 +4385,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4524,50 +4526,64 @@
 msgstr "WGS84 Geografisk"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Lambert 4 Zones (Frankrike)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} till {2} grader)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Lambert CC9 Zone (Frankrike)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertzon (Estland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4592,80 +4608,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 Zone {0} (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (Switzerland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Nord"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Syd"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Halvklot"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4888,45 +4924,45 @@
 msgstr "Detta test kontrollerar om multipolygoner är korrekta"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Sträcka av typen yta är inte sluten"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "Multipolygon utan angiven yttre sträcka"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Ingen stil för multipolygonen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Ingen stil i multipolygon relationen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Multipolygonen är inte stängd"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Inre sträcka av multipolygon är ytterst"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Multipolygon innehåller annat än sträckor"
@@ -5201,5 +5237,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5224,5 +5260,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5233,5 +5269,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5656,5 +5692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5720,5 +5756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "landsväg"
@@ -5726,5 +5762,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5732,10 +5768,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "vattendrag"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "markanvändning"
@@ -5745,5 +5781,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5757,5 +5793,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5768,5 +5804,5 @@
 msgstr "Allmän transport"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6131,5 +6167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6238,4 +6274,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6334,5 +6371,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6375,5 +6412,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6662,6 +6699,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6889,9 +6926,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr ""
 
@@ -6948,6 +6985,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6969,6 +7006,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7368,5 +7405,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7609,5 +7646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7821,7 +7858,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "okänd"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8085,5 +8152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8103,5 +8170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8118,5 +8185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Hämta hem ofullständiga medlemmar av valda relationer"
@@ -8124,5 +8191,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Hämta ofullständiga medlemmar"
@@ -8165,5 +8232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8171,5 +8238,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8364,5 +8431,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8465,5 +8532,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Användare"
@@ -9457,5 +9523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9637,5 +9703,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9778,4 +9844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9787,4 +9854,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -10049,9 +10122,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10060,13 +10133,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10079,18 +10152,19 @@
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Ändra värden?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10099,5 +10173,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10107,5 +10181,5 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10114,27 +10188,31 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Välj de objekt vars egenskaper du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10143,62 +10221,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10262,8 +10340,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10286,5 +10366,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10614,9 +10694,4 @@
 msgstr "{0} konflikter uppstod under import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10656,10 +10731,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10944,37 +11013,4 @@
 msgstr "Typ"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "okänd"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11090,20 +11126,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Historik för sträcka {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -11195,5 +11231,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11747,8 +11783,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -12150,4 +12186,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12173,11 +12210,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12254,38 +12284,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Anpassa färger"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Standard"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Välj en färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Namn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12296,9 +12326,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12306,26 +12336,26 @@
 msgstr "Beskrivning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12334,8 +12364,8 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12344,12 +12374,12 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12358,10 +12388,10 @@
 msgstr[1] "{0} spår, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12369,78 +12399,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Hämta hem i närheten av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "enbart sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "spår och sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12451,11 +12481,11 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12465,6 +12495,6 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12474,27 +12504,27 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12504,29 +12534,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12630,5 +12660,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12638,57 +12668,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Hämta ruta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Hämta alla rutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Öka zoomläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Minska zoomläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13225,10 +13263,10 @@
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps-markör"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13236,5 +13274,5 @@
 msgstr[1] "markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13243,26 +13281,26 @@
 msgstr[1] "{0} består av {1} markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Växla visning av markörtext och ikoner."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Synkronisera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Du behöver pausa ljudet precis när du hör synkroniseringsindikatorn."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13270,14 +13308,14 @@
 msgstr "Ljud synkroniserat vid punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Det går inte att synkronisera i det lager som spelas upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Skapa ljudmarkör vid spelhuvud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13305,13 +13343,13 @@
 msgstr "Kunde inte skapa ny ljudmarkör."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Fel uppstod vid visning av URL:en för denna markör."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL:en var: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Fel vid visning av URL"
@@ -14257,73 +14295,73 @@
 msgstr "Färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Rita riktningspilar"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Enbart på en sträckas huvud."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Rita ut segmentens ordningsnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Rita gränser för hämtade data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Rita virtuella noder i urvalsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Rita inaktiva lager i avvikande färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Mjuk kartgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Rita riktningsanvisningar för delsträckor."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rita gränser för data hämtade från servern."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14331,9 +14369,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Rita de inaktiva datalagren i avvikande färg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14341,15 +14379,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM-data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Inget"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14360,47 +14434,39 @@
 msgstr "Alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Inget"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Tvinga linjer om inga segment importerats."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Rita stora GPS-punkter"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet (röd = långsam, grön = snabb)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -14408,5 +14474,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14430,5 +14496,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14471,5 +14537,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14483,38 +14549,18 @@
 msgstr "Fotgängare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Snabb ritning (ser sämre ut)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14525,10 +14571,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Rita linjer mellan råa GPS-punkter"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14538,10 +14584,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14550,10 +14596,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maxlängd (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -14562,10 +14608,10 @@
 "linjeinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -14574,5 +14620,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14582,14 +14628,14 @@
 "senast ritade pil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimiavstånd (pixlar)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Rita större punkter för GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14599,13 +14645,13 @@
 "hjälp av lagerhanteraren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14613,27 +14659,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Spår- och punktfärgläggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15302,5 +15366,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15392,5 +15456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Återställ"
@@ -15671,6 +15735,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Uppdatera alltid utan att fråga"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16055,5 +16119,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16082,9 +16146,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16366,6 +16430,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16688,5 +16752,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16900,5 +16964,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -17290,4 +17354,9 @@
 msgstr "Spara användare och lösenord (okrypterat)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18096,4 +18165,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18214,4 +18285,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18779,5 +18864,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -35088,4 +35173,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35102,6 +35188,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35120,15 +35206,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "förkortat gatunamn"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "enkelriktningstagg på en nod"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "brotagg på en nod"
@@ -35139,12 +35225,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "enstaka nod felaktigt taggad som landsväg (highway)"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Onamnad oklassifierad landsväg (highway)"
@@ -35153,16 +35239,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "landsväg som saknar referens"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "tillfällig landsvägstyp"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "felstavat nyckelnamn"
@@ -35172,10 +35258,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "cykelstig med taggen cykel"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "gångstig med taggen fotgängare"
@@ -35184,10 +35270,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "separat cykelväg som fil på en cykelväg"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "hinder använt på en sträcka"
@@ -35196,35 +35282,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "maxhastighet använt på gångstig"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "lagertagg med plustecken"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "gatunamn innehåller ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "relation utan typ"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "restaurang utan namn"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "ovanlig kombination av taggar"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35329,117 +35424,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE-kartor"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE-kartor (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35684,6 +35789,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Inskickning avbruten"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35785,9 +35890,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35805,23 +35910,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35829,26 +35964,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Information"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35856,5 +36019,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35965,9 +36128,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -36066,17 +36229,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36707,28 +36887,35 @@
 msgstr "Välj commune"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Automatkälla"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36848,9 +37035,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Ersätt den ursprungliga vita bakgrunden med den bakgrundsfärg som angivits i "
-"JOSM:s inställningar."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37740,5 +37925,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37748,17 +37933,17 @@
 "skicka in spår, se här:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
@@ -37910,5 +38095,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37916,10 +38101,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37928,5 +38113,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37935,6 +38120,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37943,9 +38128,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38104,71 +38289,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38176,32 +38369,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38236,6 +38423,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38366,30 +38553,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39087,5 +39287,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39102,5 +39302,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39835,17 +40035,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39859,36 +40059,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40510,5 +40706,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41482,4 +41678,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41699,6 +41912,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41945,5 +42158,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42514,5 +42727,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42904,2618 +43117,31 @@
 msgstr ""
 
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Uploading data"
-#~ msgstr "Skickar data"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Downloading..."
-#~ msgstr "Hämtar..."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} raderad.)"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "bild"
-#~ msgstr[1] "bilder"
-
-#~ msgid "timezone difference: "
-#~ msgstr "tidsskillnad: "
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Osparade ändringar"
-
-#~ msgid "Unknown version"
-#~ msgstr "Okänd version"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Felaktigt lösenord eller användarnamn."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Angiven tid kunde inte tolkas."
-
-#~ msgid "OSM password"
-#~ msgstr "OSM-lösenord"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter..."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Välj ett bokmärke först."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Inte implementerat ännu."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Okänd filändelse."
-
-#~ msgid "File could not be found."
-#~ msgstr "Filen kunde inte hittas."
-
-#~ msgid "Jump forward"
-#~ msgstr "Hoppa framåt"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Snabbare framåt"
-
-#~ msgid "Slower Forward"
-#~ msgstr "Långsammare framåt"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Ange värden för alla konflikter"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alla sträckor var tomma"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "De noderna är inte i en cirkel."
+#~ msgid "Change values?"
+#~ msgstr "Ändra värden?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "ovanlig kombination av taggar"
 
 #~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Välj antingen exakt tre noder eller en sträcka som innehåller exakt tre "
-#~ "noder."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Välj åtminstone en uppgift att hämta"
-
-#~ msgid "gps track description"
-#~ msgstr "beskrivning av gps-spår"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Onlinehjälp för JOSM"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fel vid inläsning av sida{0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Öppna i webbläsare"
+#~ "Ersätt den ursprungliga vita bakgrunden med den bakgrundsfärg som "
+#~ "angivits i JOSM:s inställningar."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Inskickning avbruten"
 
 #~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Klicka för att ta bort. Skift: ta bort delsträcka. Alt: lämna kvar "
-#~ "oanvända noder vid borttagning av sträcka. Ctrl: ta bort objekt som "
-#~ "refererar hit"
-
-#~ msgid "Jump back."
-#~ msgstr "Hoppa tillbaka."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Dra en delsträcka för bilda en rektangel."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Välj, flytta och rotera objekt."
+#~ "Ignorerar undantag eftersom hämtningen avbrutits. Undantaget var: {0}"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Uppdatera alltid utan att fråga"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
-#~ "dem?"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Välj åtminstone två noder att slå ihop."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Slå ihop noder med olika medlemskap?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Det går inte att slå ihop noderna: En väg som fortfarande används skulle "
-#~ "behöva tas bort."
-
-#~ msgid "Create a new map."
-#~ msgstr "Skapa ny karta"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Kunde inte byta namn på filen \"{0}\"."
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Öppna en inställningssida för globala inställningar."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr ""
-#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Det uppstod ett fel när backup-filen skulle återställas."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Det uppstod ett fel när filen skulle sparas."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Kunde inte backa upp filen."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Ange en söksträng."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "En avslutande parentes förväntades"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Ett rollbaserat relationsmedlemskap kopierades till alla nya sträckor.\n"
-#~ "Du bör kontrollera detta och rätta till eventuella fel."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Skicka in dessa ändringar?"
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Skicka in alla ändringar till OSM-servern."
-
-#~ msgid "Change"
-#~ msgstr "Ändra"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Det finns olösta konflikter. Du måste lösa dessa först."
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Du håller på att ta bort noder utanför det område som du har hämtat hem."
-#~ "<br> Detta kan leda till problem eftersom andra objekt (som du inte ser) "
-#~ "kanske använder dem.<br> Vill du verkligen ta bort dem?"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "TaBortRelationsMedlem"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotera"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Urvalet \"{0}\" ingår i relationen \"{1}\" med rollen {2}\n"
-#~ "Ta bort från relationen?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Jämka {0} konflikter i {1} objekt"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Ta bort {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Ta bort {1} {0}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Urvalet \"{0}\" ingår i relationen \"{1}\"\n"
-#~ "Ta bort från relationen?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relationskonflikt"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dela delsträcka"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Verkställ inte ändringar"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "olik"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Kunde inte skriva bokmärken."
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Kunde inte läsa bokmärken."
-
-#~ msgid "their version:"
-#~ msgstr "deras version:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt har konflikter:"
-#~ msgstr[1] "{0} objekt har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min version:"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Jämkar konflikter"
-
-#~ msgid "resolved version:"
-#~ msgstr "jämkad version:"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Jämka konflikter"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Ta bort valt lager."
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Visa/Dölj text/ikoner"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Det finns osparade ändringar. Skall lagret tas bort i alla fall?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Vill du verkligen ta bort hela lagret?"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalager"
-
-#~ msgid "No data imported."
-#~ msgstr "Ingen data importerad."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Ange först önskade koordinater."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Ange platsens namn."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakta {0}..."
-
-#~ msgid "Load Selection"
-#~ msgstr "Hämta urval"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Slå ihop det lager som finns precis under med det valda lagret."
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambertzon (Frankrike)"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Om värdet är tomt tas nyckeln bort."
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Taggar (tomt värde tar bort taggen)"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Redigera ny relation"
-
-#~ msgid "Create new relation"
-#~ msgstr "Skapa ny relation"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Redigera relation # {0}"
-
-#~ msgid "Occupied By"
-#~ msgstr "Innehas av"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lägg till vald"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan inte ansluta till server."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fel vid inläsning av serverns svar."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Konflikter upptäcktes under import."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Medlemmar: {0}"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Uppdatera urvalslistan."
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Datakällor och -typer"
-
-#~ msgid "to"
-#~ msgstr "till"
-
-#~ msgid "y from"
-#~ msgstr "y från"
-
-#~ msgid "Download Area"
-#~ msgstr "Hämta område"
-
-#~ msgid "x from"
-#~ msgstr "x från"
-
-#~ msgid "zoom level"
-#~ msgstr "zoomnivå"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Inga bilder med läsbara tidsangivelser hittades."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Tid saknas för punkt {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Bilder för {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Läs in GPX..."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS startpunkt: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "nuvarande delta: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS slutpunkt: {0}"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Synka klocka"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
-
-#~ msgid "Length: "
-#~ msgstr "Längd: "
-
-#~ msgid "name"
-#~ msgstr "namn"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "ett spår med {0} punkt"
-#~ msgstr[1] "ett spår med {0} punkter"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} punkt"
-#~ msgstr[1] "{0} punkter"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} består av {1} spår"
-#~ msgstr[1] "{0} består av {1} spår"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "punkt"
-#~ msgstr[1] "punkter"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Aktiverar uppdaterade insticksmoduler"
-
-#~ msgid "Set the language."
-#~ msgstr "Ange språk"
-
-#~ msgid "layer not in list."
-#~ msgstr "lagret finns inte i listan."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Ansluter till OSM-servern"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Fel vid tolkning"
-
-#~ msgid "File not found"
-#~ msgstr "Filen hittades inte"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alla installerade insticksmoduler är av senaste version."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Föregående markering"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Spela upp föregående markering"
-
-#~ msgid "Play next marker."
-#~ msgstr "Spela upp nästa markering"
-
-#~ msgid "Next Marker"
-#~ msgstr "Nästa markering"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} inom spåret."
-
-#~ msgid "Timespan: "
-#~ msgstr "Tidsomfång: "
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Öppna fil (som rå gps, om .gpx)"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametrar behandlas i den ordning som de anges, så du måste hämta\n"
-#~ "data innan --selection"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Det gick inte att aktivera de uppdaterade insticksmodulerna. Kontrollera "
-#~ "om JOSM har behörighet att skriva över de existerande."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Maximal linjelängd (i meter). Ange '-1' för att rita alla linjer oavsett "
-#~ "längd."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Hämtade information om insticksmoduler från {0} ställe"
-#~ msgstr[1] "Hämtade information om insticksmoduler från {0} ställen"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Kunde inte hitta någon information om insticksmoduler."
-
-#~ msgid "Download List"
-#~ msgstr "Hämta lista"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Behåll backup-filer"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Hämta saknade insticksmoduler"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Fel vid inläsning av informationsfil för insticksmodul: {0}"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Hämta följande insticksmoduler?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Version {1}{2}"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Uppdatera följande insticksmoduler:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonym"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Användarnamn (epost) för OSM-kontot"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxyinställningar"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Aktivera inbyggda förval"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
-
-#~ msgid "Error during parse."
-#~ msgstr "Fel vid tolkning."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Ogiltigt objekt med id=0"
-
-#~ msgid "Preparing data..."
-#~ msgstr "Förbereder data..."
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>Dessutom så aktiveras kortkommandon när händelser knyts till en "
-#~ "menyknapp för första gången. Därför kan det innebära att din ändringar "
-#~ "märks även innan du startat om --- men det har då inte gjorts någon "
-#~ "kontroll om två kortkommandon krockar med varandra. Detta är ännu en "
-#~ "anledning till varför du bör <b>starta om</b> JOSM efter att du har "
-#~ "ändrat något här.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Du kommer att märka att urvalslistan för tangenter på nästa sida "
-#~ "innehåller alla tangenter som finns på alla typer av tangentbord som Java "
-#~ "känner till, inte enbart de som finns på det tangentbord du använder. "
-#~ "Använd enbart de värden som motsvarar tangenter som motsvarar en faktisk "
-#~ "tangent på ditt tangentbord. Så om det inte finns någon 'Copy'-tangent på "
-#~ "ditt tangentbord (pc-tangentbord saknar dem, sun-tangentbord har dem) så "
-#~ "använd den inte. Det kommer också att finnas 'tangenter' som motsvarar "
-#~ "ett kortkommando på ditt tangentbord (t ex ':' /kolon). Använd inte dem "
-#~ "heller, använd den omodifierade tangenten (';'/semikolon på ett "
-#~ "amerikanskt tangentbord, '.'/punkt på tyska eller svenska tangentbor,...) "
-#~ "istället. Om du inte gör så kan krockar uppstå, eftersom det inte finns "
-#~ "något sätt för JOSM att veta att på ett amerikanskt tangentbord så är i "
-#~ "själva verket Ctrl+Shift+; och Ctrl+: samma sak...</p>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>På den sista sidan listas de modifierartangenter som JOSM automatiskt "
-#~ "använder för kortkommandon. För var och en av de fyra typerna av "
-#~ "kortkommandon finns det tre alternativ. JOSM kommer att prova dessa "
-#~ "alternativ i angiven ordning för att lösa eventuella krockar. Om alla "
-#~ "alternativ ger ett redan existerande kortkommando som resultat, så kommer "
-#~ "JOSM istället att knyta ett slumpat kortkommando till händelsen.</p>"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr ""
-#~ "Varning - insticksmodulen {0} har begärts. Denna insticksmodul behövs "
-#~ "inte längre."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Insticksmodulen kunde ej hittas: {0}."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
-#~ "servern."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Det uppstod problem med följande insticksmoduler:\n"
-#~ "\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Uppdatera insticksmoduler"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
-#~ "JOSM från."
-
-#~ msgid "Do not show again"
-#~ msgstr "Visa inte igen"
-
-#~ msgid "Open an other photo"
-#~ msgstr "Öppna ett annat foto"
-
-#~ msgid "All images"
-#~ msgstr "Alla bilder"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Dubblera valda sträckor."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Dubblera sträcka"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Skapa en dubblett av sträcka"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Rasterlager:"
-
-#~ msgid "Grid layout"
-#~ msgstr "Rasterlayout"
-
-#~ msgid "World"
-#~ msgstr "Världen"
-
-#~ msgid "Boat"
-#~ msgstr "Båt"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorbåt"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cykelbana"
-
-#~ msgid "Footway"
-#~ msgstr "Gångstig"
-
-#~ msgid "Shop"
-#~ msgstr "Affär"
-
-#~ msgid "football"
-#~ msgstr "amerikansk fotboll"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motorsport"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Redigera motorsport"
-
-#~ msgid "Edit Football"
-#~ msgstr "Redigera amerikansk fotboll"
-
-#~ msgid "Football"
-#~ msgstr "Amerikansk fotboll"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Redigera rugby"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr ""
-#~ "Enbart intressanta riktningsanvisningar (t ex i kombination med taggen "
-#~ "oneway - enkelriktat)"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Snabbvalsgrupp ''{0}''"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Källor för snabbval för taggning"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Källa till snabbval för taggning"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
-
-#~ msgid "Amenities"
-#~ msgstr "Inrättningar"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Noder som saknar tagg och inte ingår i en sträcka"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Inställningar för WMS-insticksmodulen"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Ange ett menynamn och en URL för WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "URL för WMS"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr ""
-#~ "Justera listan över WMS-servrar som visas i menyn för WMS-insticksmodulen"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Hjälp om WMS-insticksmodulen"
-
-#~ msgid "Help / About"
-#~ msgstr "Hjälp / Om"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Hämta WMS-ruta från {0}"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Justera WMS-lagrets position"
-
-#~ msgid "help"
-#~ msgstr "hjälp"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Rätta till de valda felen"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ignorera de valda felen nästa gång."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Data med fel. Skicka in ändå?"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Detta test kontrollerar om två vägar, järnvägar eller vattendrag korsar "
-#~ "varandra i samma lager, men inte förenas med en nod."
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Ogiltig kombination av nyckel och värde"
-
-#~ msgid "zoom"
-#~ msgstr "zooma"
-
-#~ msgid "near"
-#~ msgstr "nära"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Ange en söksträng"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "osmarender options"
-#~ msgstr "inställningar för osmarender"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "load data from API"
-#~ msgstr "hämta data från API"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Tillåtna handlingar"
-
-#~ msgid "change the selection"
-#~ msgstr "ändra urval"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Inställningar för insticksmodulen Fjärrstyrning"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
-
-#~ msgid "requested: {0}"
-#~ msgstr "begärd: {0}"
-
-#~ msgid "error loading metadata"
-#~ msgstr "fel vid hämtning av metadata"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Källor för rutor"
-
-#~ msgid "image not loaded"
-#~ msgstr "bilden har inte hämtats"
-
-#~ msgid "Request Update"
-#~ msgstr "Begär omrendering"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Visa status för ruta"
-
-#~ msgid "error requesting update"
-#~ msgstr "fel vid begäran om uppdatering"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger "
-#~ "musknapp och flytta musen. Välj: Klicka"
-
-#~ msgid "start"
-#~ msgstr "början"
-
-#~ msgid "end"
-#~ msgstr "slut"
-
-#~ msgid "Grid"
-#~ msgstr "Rutnät"
-
-#~ msgid "Commit comment"
-#~ msgstr "Bidragskommentar"
-
-#~ msgid "Accomodation"
-#~ msgstr "Logi"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Edit Station"
-#~ msgstr "Redigera station"
-
-#~ msgid "Charge"
-#~ msgstr "Avgift"
-
-#~ msgid "Bridleway"
-#~ msgstr "Gång-/Ridstig"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Bruksväg klass 3"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Bruksväg klass 2"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Bruksväg klass 1"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Bruksväg klass 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Bruksväg klass 4"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Redigera en krävande bergsvandringsled"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Fjällvandringsled"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Redigera en fjällvandringsled"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Redigera en vandringsled"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Bergsvandringsled"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "Krävande bergsvandringsled"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Redigera en bergsvandringsled"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-spår har hämtats"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Återställ alla de nu valda objekten till den version som valts i "
-#~ "historiklistan."
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Tack för att du förstår.</p>"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Aktivera proxyserver"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Värd för proxyserver"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Användarnamn för proxyserver"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Lösenord för proxyserver"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Port för proxyserver"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Det nödvändiga attributet \"{0}\" saknas."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
-#~ "dem?"
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "Duplicera {0} noder till {1} noder"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Jag är i följande tidzon: "
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Bilder som inte taggats ännu"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Bilder utan positionsangivelse i exif"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "Visa historikinformation om sträckor eller noder i OSM"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Ett oväntat undantag inträffade.\n"
-#~ "\n"
-#~ "Detta beror alltid på fel i koden. Om du använder senaste\n"
-#~ "lämna in en felrapport."
-
-#~ msgid "Exception occurred"
-#~ msgstr "Undantag inträffade"
-
-#~ msgid "Preparing..."
-#~ msgstr "Förbereder..."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Skickar in..."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
-#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Lämna in en rapport på {0}"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Följande information måste finnas med:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat "
-#~ "som möjligt)!"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Redigera egenskaper"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fel vid borttagande av fil för insticksmodulen: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Insticksmodulen finns redan"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr ""
-#~ "Rita inte pilar om de inte befinner sig på åtminstone detta avstånd från "
-#~ "senast ritade pil."
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Ta bort \"{0}\" för {1} ''{2}''"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Ta bort \"{0}\" för {1} {2}"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grader Minuter Sekunder"
-
-#~ msgid "S"
-#~ msgstr "S"
-
-#~ msgid "N"
-#~ msgstr "N"
-
-#~ msgid "W"
-#~ msgstr "V"
-
-#~ msgid "E"
-#~ msgstr "Ö"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Checksum-fel: "
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Felaktigt utformade meningar: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "Import från NMEA misslyckades!"
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Okända meningar: "
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Enbart två noder kan vara valda"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Urvalet måste bestå uteslutande av sträckor."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Enbart en nod vald"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Använd decimalgrader."
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Ange den nya nodens koordinater."
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Kunde inte skapa en ny felrapport. Resultat: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr ""
-#~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "bekräfta alla fjärrstyrda handlingar manuellt"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importera TCX-fil som GPS-spår"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importera TCX-fil..."
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Riktningsindex '{0}' kunde inte hittas"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotaggade bilder"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "Visa geotaggade foton"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Öppna bilder med AgPifoJ..."
-
-#~ msgid "Update position for: "
-#~ msgstr "Uppdatera position för: "
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Jag kan ta en bild av min GPS-mottagare.<br>Kan detta vara till "
-#~ "nytta?</html>"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id för Metacartas korrigerade kartbild"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "korrigeringsid={0}"
-
-#~ msgid "Copy Default"
-#~ msgstr "Kopiera förval"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Välj vilken rad du vill kopiera."
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS-url (Förval)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Klaffbro"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr ""
-#~ "Knappen '{0}' är knuten som snabbtangent till mer än en funktion - "
-#~ "knappen kommer att ignoreras!"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Tänk på att kortkommandon knyts till händelser när JOSM startar. Så du "
-#~ "behöver <b>starta om</b> JOSM för att dina ändringar skall märkas.</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>Pseudomodifieraren 'disabled' avaktiverar kortkommandot när detta "
-#~ "påträffas.</p>"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Hittade element av typen <nd> på icke-sträcka"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har nollreferens"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Skapa icke-ljudsmarkörer vid läsning av GPX."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Bas-URL för servern"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Bas-URL för OSM-servern (REST API)"
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Nollkoordinater: "
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "Det saknas argument för eller (or)."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "Det saknas argument för inte (not)."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Insticksmodulen fjärrstyrning kommer alltid att lyssna på port 8111 på "
-#~ "localhost. Porten kan inte ändras eftersom den refereras till av externa "
-#~ "applikationer i kommunikation med insticksmodulen."
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan inte läsa sökresultat för plats från servern"
-
-#~ msgid "hikingmap"
-#~ msgstr "vandringskarta"
-
-#~ msgid "citymap"
-#~ msgstr "stadskarta"
-
-#~ msgid "map"
-#~ msgstr "karta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "cykelkarta"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Antal kablar"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} hittades med gps-taggar."
-
-#~ msgid ""
-#~ "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 versionen av JOSM och alla insticksmoduler."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, Det saknas förmodligen några taggar."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fann <member>-tagg utanför relation."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Felformaterad nod-id"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>VARNING: Lösenordet lagras okryperat i inställningsfilen."
-#~ "<br>Lösenordet skickas okryperat till servern, som en del av URL:en."
-#~ "<br><b>Använd inte ett värdefullt lösenord.</b></html>"
-
-#~ msgid ""
-#~ "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 "
-#~ "definieras. Se http://josm.openstreetmap.de/wiki/TaggingPresets för mer "
-#~ "information."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Kunde inte läsa från URL:en: \"{0}\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Inläsningsfel på URL:en: \"{0}\""
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Skapa en dubblett av sträcka"
-
-#~ 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 ""
-#~ "Den eller de valda sträckorna har noder som ligger utanför det område för "
-#~ "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?"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Hämta en korrigerad bild från Metacartas kartkorrigerar-WMS"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "Du kan lägga till, ändra och ta bort WMS-poster med hjälp av "
-#~ "inställningsfliken för WMSplugin - dessa kommer att synas i WMS-menyn.\n"
-#~ "\n"
-#~ "Du kan också göra dessa ändringar manuellt under avancerade "
-#~ "inställningar, enligt följande mall:\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"
-#~ "Exempel på fullständigt WMS URL-inmatningsformat (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"
-#~ "Vad gäller Metacartas Kartkorrigerare http://labs.metacarta.com/"
-#~ "rectifier/ , så behöver du enbart ange relevant 'id'.\n"
-#~ "För att lägga till en menypost för en korrigerad karta från Metacarta, "
-#~ "skapa manuellt en url som i följande exempel och ersätt 73 med id för din "
-#~ "bild: \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"
-#~ "Observera: Se till att bilden får användas enligt copyright-regler, om du "
-#~ "är tveksam så använd inte den."
-
-#~ msgid "Portcullis"
-#~ msgstr "Fällgaller"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM."
-#~ msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Ingen av noderna på denna sträcka är knuten till något annat."
-
-#~ 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 vill förenkla den?"
-#~ msgstr[1] ""
-#~ "Urvalet innehåller {0} sträckor. Är du säker på att du vill förenkla dem "
-#~ "alla?"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Servern svarade med internt fel. Försök med ett mindre område eller "
-#~ "försök igen efter en stund."
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Insticksmodulen {0} verkar korrupt eller kunde inte hämtas automatiskt."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Skicka in till OSM..."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Konfigurera hämtställen..."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Arkivfil för insticksmodul finns redan tillgänglig. Önskar du hämta "
-#~ "nuvarande version genom att ta bort det existerande arkivet?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "Tog bort medlemmen ''{0}'' i relationen."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "Tom medlem i relationen."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Multipolygonsträckan ''{0}'' är inte sluten."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Sträcka \"{0} med mindre än två punkter."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Icke-sträcka ''{0}'' i multipolygon."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Stil för yttre väg ''{0}'' passar inte."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Fel: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Varning: {0}"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kan inte öppna inställningsmappen: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Det fanns fel i inställningsfilen. Backar upp den gamla som {0}."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "En av de valda filerna var null !!!"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Välj en användare m h a upphovsmannafönstret"
-
-#~ msgid "Please select some data"
-#~ msgstr "Välj några data"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Öppna användarens sida i en webbläsare"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Visa upphovsmannafönstret"
-
-#~ msgid "Open User Page"
-#~ msgstr "Öppna användarsida"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Det fungerar tyvärr inte med anonyma användare"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Ersätter urvalet med användarens data"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Upphovsmän: {0}"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Lager: {0}"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Kommandolista: {0}"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikter: {0}"
-
-#~ msgid "History of Element"
-#~ msgstr "Objektshistorik"
-
-#~ msgid "Painting problem"
-#~ msgstr "Ritningsproblem"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Välj användardata"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klicka på Uppdatera för att uppdatera listan"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "En sträcka för en yta är inte sluten."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Kontrollera om problem uppstod vid ritning av kartan"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Öppna OpenStreetBugs-listan och aktiverar automatisk hämtning"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Några av noderna befinner sig (nästan) på linje"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och "
-#~ "panorera."
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Projektion kunde ej läsas från inställningarna. Använde rEPSG:4326"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr ""
-#~ "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: "
-#~ "{0}\n"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr ""
-#~ "<b>Baker Street</b> - 'Baker' och 'Street' i vilken nyckel eller vilket "
-#~ "värde som helst."
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr ""
-#~ "<b>\"Baker Street\"</b> - 'Baker Street' i vilken nyckel eller vilket "
-#~ "värde som helst."
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 'Bak' var som helst i nyckeln name."
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - som inte har 'Bak'  i nyckeln name."
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id:</b>... - objektet med angiven ID"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr ""
-#~ "Use <b>\"</b> för att sätta operatorer inom citattecken (t ex om nyckeln "
-#~ "innehåller :)"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>nodes:</b>... - objekt med givent antal noder"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>Du använder dig av projektionen EPSG:4326 vilket kan leda "
-#~ "till<br>oönskade resultat när rätar upp fyrkanter.<br>Ändra vilken "
-#~ "projektion du använder för att bli av med detta varningsmeddelande."
-#~ "<br>Vill du fortsätta?"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Det finns mer än en \"till\"-sträcka."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Det finns mer än en \"från\"-sträcka."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Det finns inte någon \"till\"-sträcka."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Det finns inte någon \"från\"-sträcka."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Okänd roll ''{0}''."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Okänd medlemstyp för ''{0}''."
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synkronisera Tid med GPS-enheten"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Sätt {0}={1} för {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Sätt {0}={1} för {2} {3}"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Spara och avsluta"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Ta bort det valda"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "Ta bort alla för närvarande valda objekt från relationen"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Öppna först ett lager (GPX, OSM, cache)"
-
-#~ msgid "Add a new layer"
-#~ msgstr "Lägg till ett nytt lager"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "Lambertzon 1 cachefil (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "Lambertzon 1 cachefil (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "Lambertzon 1 cachefil (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "Lambertzon 1 cachefil (.2)"
-
-#~ msgid "Zone"
-#~ msgstr "Zon"
-
-#~ msgid "Lambert zone"
-#~ msgstr "Lambertzon"
-
-#~ msgid "No username provided."
-#~ msgstr "Inget användarnamn angivet."
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Publik"
-
-#~ msgid "No password provided."
-#~ msgstr "Inget lösenord angviet."
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Största tillåtna höjd (meter)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Största tillåtna bredd (meter)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Största tillåtna längd (meter)"
-
-#~ msgid "intermedia"
-#~ msgstr "medelsvår"
-
-#~ msgid "advance"
-#~ msgstr "svår"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Vattenpunkter"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Glidande karta"
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Stil för restriktion {0} kunde inte hittas."
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Öppnar ändringssamling..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Servern har inte stöd för ändringssamlingar"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "VIKTIGT : det finns data långt bort\n"
-#~ "från nuvarande Lambertzongränser.\n"
-#~ "Skicka inte in några data efter du fått detta meddelande.\n"
-#~ "Ångra din sista åtgärd, spara ditt arbete\n"
-#~ "och börja på ett nytt lager i den nya zonen."
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internt fel: kan inte kontrollera förhållanden för inget lager. "
-#~ "Rapportera in detta som ett fel."
-
-#~ msgid "Delete Layer"
-#~ msgstr "Ta bort lager"
-
-#~ msgid "Login"
-#~ msgstr "Logga in"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Ta bort och hämta hem"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Slå ihop i alla fall"
-
-#~ msgid "Download Plugins"
-#~ msgstr "Hämta insticksprogram"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Jämka konflikter"
-
-#~ msgid "change the viewport"
-#~ msgstr "ändra vad som visas"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Slå ihop i alla fall"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Kontrollera om det finns ritningsanmärkningar."
-
-#~ msgid "autozoom"
-#~ msgstr "automatisk zoomning"
-
-#~ msgid "autoload tiles"
-#~ msgstr "automatisk hämtning av rutor"
-
-#~ msgid "SlippyMap"
-#~ msgstr "GlidandeKarta"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Hämta bild från den franska Cadastre-WMS:en"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "Tagg för källa har automatiskt lagts till:"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Inställningar för insticksprogrammet GlidandeKarta"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Automatisk zoomning: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Automatisk hämtning av rutor: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Största tillåtna zoomläge: "
-
-#~ msgid "Extract building footprints"
-#~ msgstr "Extrahera byggnadskonturer"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "För närvarande kan enbart upp till två ytor förenas."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsätt ändå"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "Välj åtminstone en sluten väg som skall förenas."
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor."
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "DETTA ÄR EXPERIMENTKOD. Spara och kontrollera ditt arbete innan du "
-#~ "skickar in det."
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Justera valt WMS-lagers läge"
-
-#~ msgid "sports"
-#~ msgstr "Sportaffär"
-
-#~ msgid "optician"
-#~ msgstr "Optiker"
-
-#~ msgid "Move Down"
-#~ msgstr "Flytta nedåt"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "Relationsredigerare:{0}"
-
-#~ msgid "Move Up"
-#~ msgstr "Flytta uppåt"
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Jämka konflikt"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Mer än en \"via\" hittades."
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Ingen nod eller sträcka för \"via\" hittades."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Välj åtminstone en nod, sträcka eller relation. Endast objekt som redan "
-#~ "skickats in har en historik."
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du "
-#~ "fortsätta?"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr ""
-#~ "Uppdaterar det aktuella datalagret från servern (hämtar hem data igen)"
-
-#~ msgid "Update Data"
-#~ msgstr "Uppdatera data"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Ändra projektionen till {0} först."
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ogiltig kartprojektion"
-
-#~ msgid "Edit Beverages  Shop"
-#~ msgstr "Redigera dryckesaffär"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Redigera en bruksväg klass 1"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Redigera en bruksväg klass 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Redigera en bruksväg klass 3"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Redigera en bruksväg klass 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Redigera en bruksväg klass 5"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "Krävande fjällvandringsled"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Redigera en krävande fjällvandringsled"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Svår fjällvandringsled"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Redigera en svår fjällvandringsled"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Redigera en klaffbro"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Redigera ett fällgaller"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller "
-#~ "laddat ner ett datalager?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Följande fel uppstod vid massnedladdning:"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Fel under nedladdning"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- nuvarande version är {0}"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "Växla mellan fullskärmsläge"
-
-#~ msgid "Full Screen"
-#~ msgstr "Fullskärm"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Istället för --download=<bbox> kan du använda osm://<bbox>\n"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "Fotografierna innehåller ingen tidsinformation."
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "De markerade fotografierna innehåller ingen tidsinformation."
-
-#~ msgid "Default Values"
-#~ msgstr "Standardinställningar"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "(Tidsdifferens om {0} dagar)"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "Stad/ort {0} kunde inte hittas i WMS.\n"
-#~ "Kontrollera tillgängligheten via www.cadastre.gouv.fr"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr "Lambertzon {0} i cache inkompatibel med nuvarande Lambertzon {1}"
-
-#~ msgid "Raster center: {0}"
-#~ msgstr "Rastercenter: {0}"
-
-#~ msgid "Fade background: "
-#~ msgstr "Tona bakgrund: "
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "\"Another geotag plugin\" (Ytterligare ett geotag-plugin) för JOSM. "
-#~ "Korrelerar bilder med GPS-spår eller importerar EXIF-geotaggade bilder."
-
-#~ msgid "Optional"
-#~ msgstr "Valfri"
-
-#~ msgid "Goods"
-#~ msgstr "Lätt lastbil"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Flytta objekt genom att dra; Använd Skift för att lägga till (Ctrl för "
-#~ "att växla läge); Skift+Ctrl för att rotera"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr ""
-#~ "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat "
-#~ "spår."
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Hittade {0} träffar för {1} i GPX-spår {2}"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "Parade ihop {0} av {1} foton med GPX-spåret"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Förskjutning mellan spår och foton: {0}m {1}s"
-
-#~ msgid "Click and drag to move route nodes."
-#~ msgstr "Klicka och dra för att flytta ruttnoder."
-
-#~ msgid "Grid rotation"
-#~ msgstr "Rutnätsrotation"
-
-#~ msgid "Click to add route nodes."
-#~ msgstr "Klicka för att lägga till ruttnoder."
-
-#~ msgid "Add grid"
-#~ msgstr "Lägg till rutnät"
-
-#~ msgid "Start routing"
-#~ msgstr "Påbörja ruttberäkning"
-
-#~ msgid "Remove route nodes"
-#~ msgstr "Ta bort ruttnoder"
-
-#~ msgid "<multiple>"
-#~ msgstr "<flera>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Slå ihop områden: Ta bort korta sträckor"
-
-#~ msgid "Closed Way"
-#~ msgstr "Sluten sträcka"
-
-#~ msgid "Fix relations"
-#~ msgstr "Korrigera relationer"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Slog ihop område som låg ovanpå sig själv"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negativa värden avser västra/södra halvklotet."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Slå ihop sträckor med olika roller?"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projektionen \"{0}\" är enbart avsedd\n"
-#~ "för latituder mellan 46,1° och 57°.\n"
-#~ "Använd ett annat projektionsystem om du\n"
-#~ "inte använder en fransk WMS-server.\n"
-#~ "Skicka inte in några data efter du har fått detta meddelande."
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr ""
-#~ "Insticksmodul {0} behövs för att insticksmodul {1} ska fungera, men kunde "
-#~ "inte hittas."
-
-#~ msgid "Enter Password"
-#~ msgstr "Ange lösenord"
-
-#~ msgid "Uploading"
-#~ msgstr "Ladda Upp"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Uppladningen till OSM API misslyckades"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Rutnätsorigo"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Ja, återskapa dem också"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Nej, avbryt"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>Det finns {0} ytterligare noder som används av väg {1}<br>, som är "
-#~ "raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Återskapa ytterligare noder?"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "Ångrar radering av väg..."
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr ""
-#~ "Projektion kunde inte hämtas från inställningarna. Använder Mercator."
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "Kontrollerar huruvida nod {0} är borta..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "Återskapar relation..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Behåll mina"
-
-#~ msgid "Checking whether primitive {0} is gone ..."
-#~ msgstr "Kontrollerar huruvida primitiv {0} är borta..."
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "oförväntat returvärde. Erhöll {0}"
-
-#~ msgid "Primitive deleted on the server"
-#~ msgstr "Primitiv raderad på servern"
-
-#~ msgid ""
-#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
-#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
-#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
-#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
-#~ "accept the state on the server and to delete your primitive.<br>Click "
-#~ "<strong>{3}</strong> to cancel.<br>"
-#~ msgstr ""
-#~ "<html>OSM primitiv id <strong>{0}</strong> har raderats på servern<br>av "
-#~ "en annan kartograf.<br><br>Klicka <strong>{1}</strong> för att behålla "
-#~ "ditt primitiv och ignorera det raderade tillståndet.<br>Ditt primitiv "
-#~ "kommer att tilldelas ett nytt id.<br>Klicka <strong>{2}</strong> för att "
-#~ "acceptera det nya tillståndet på servern och radera ditt primitiv."
-#~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
-
-#~ msgid "Delete mine"
-#~ msgstr "Radera mina"
-
-#~ msgid ""
-#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
-#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>Det finns <strong>{0}</strong> primitiv<br>markerade för "
-#~ "individuell uppdatering. Vänligen reducera<br>urvalet till max {1} "
-#~ "primitiv.</html>"
-
-#~ msgid "Selection too big"
-#~ msgstr "Markering för stor"
-
-#~ msgid "There are no selected primitives to update."
-#~ msgstr "Det finns inga markerade primitiv att uppdatera."
-
-#~ msgid "Update Selection"
-#~ msgstr "Uppdatera markering"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Uppdatera markerade primitiv från servern"
-
-#~ msgid "Could not find primitive with id {0} in the current dataset"
-#~ msgstr "Kunde inte hitta primitiv med id {0} i nuvarande dataset"
-
-#~ msgid "Missing primitive"
-#~ msgstr "Primitiv saknas"
-
-#~ msgid "Update failed"
-#~ msgstr "Uppdatering misslyckades"
-
-#~ msgid "Failed to update the selected primitives."
-#~ msgstr "Misslyckades med att uppdatera markerade primitiv."
-
-#~ msgid "Updating primitive"
-#~ msgstr "Uppdaterar primitiv"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "Synkronisera enbart {0} {1}"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Konflikt upptäkt"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiv redan raderad"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Raderade eller flyttade primitiv"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "Följande fel inträffade under massnedladdning:"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "Fel under kommunikation med servern."
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "Kunde inte upprätta anslutning till OSM servern {0}.\n"
-#~ "Kontrollera din internetanslutning och att serverns URL är korrekt i dina "
-#~ "inställningar."
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "Ångra radering av {0} primitiv"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "Lös {0} taggninskonfliker i {1} {2}"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "Lös konflikter i nodlistan för väg {0}"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "Lös versionskonfliker för {0} {1}"
-
-#~ msgid "There's no primitive with version {0} in this history"
-#~ msgstr "Det finns inget primitiv med version {0} i denna historik"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "ingen tidigaste version funnen. Historiken är tom."
-
-#~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "Längd på värde för tagg \"{0}\" på primitiv {1} överskrider det max. "
-#~ "tillåtna längden ({2}). Värdets längd är {3}."
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
-#~ msgstr ""
-#~ "VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida "
-#~ "för OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\""
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr ""
-#~ "Antal ändringar överskrider det maximala antalet ändringar, antal "
-#~ "ändringar är {0}, max är {1}"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Misslyckades att initialisera API. Vänligen försök igen senare."
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen "
-#~ "primitiv {1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "Misslyckades att initialisera API."
-
-#~ msgid "No data"
-#~ msgstr "Inga data"
-
-#~ msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-#~ msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr ""
-#~ "Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
-#~ "to<br>delete on the server is already deleted.<br><br>The error message "
-#~ "is:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Uppladdning <strong>misslyckades</strong> eftersom en primitiv du "
-#~ "försökte<br>ta bort från servern redan är borttagen."
-#~ "<br><br>Felmeddelandet är:<br>{0}</html>"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Det finns {0} primitiver i din data som kanske<br> är borttagna "
-#~ "från servern. Om du senare försöker ta bort eller<br> uppdatera de från "
-#~ "servern kommer det troligtvis leda till<br> en konflikt.<br><br>Klicka på "
-#~ "<strong>{1}</strong> för att kontrollera statusen på dessa primitiv<br> "
-#~ "på servern.<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Datakonflikter"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parametern ''{0}'' får inte vara null"
-
-#~ msgid ""
-#~ "WARNING: launching browser windows for the first {0} of {1} selected "
-#~ "primitives only"
-#~ msgstr ""
-#~ "VARNING: Öppnar webbläsare endast för de första {0} utav {1} markerade "
-#~ "primitiven."
-
-#~ msgid "({0}/{1}) Loading parents of primitive {2}"
-#~ msgstr "({0}/{1}) Laddar föräldrar till primitiv {2}"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
-
-#~ msgid ""
-#~ "You did move more than {0} elements. Moving a large number of elements is "
-#~ "often an error.\n"
-#~ "Really move them?"
-#~ msgstr ""
-#~ "Du flyttade mer än {0} element. Flytt av ett stort antal element är ofta "
-#~ "ett fel.\n"
-#~ "Vill du verkligen flytta på dem?"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Medlemskap i relationer kopierades till alla nya vägar.\n"
-#~ "Du bör verifiera att detta är korrekt."
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "Felaktigt antal parametrar för nodoperator."
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Ändra {0} {1}"
-
-#~ msgid "Add {0} {1}"
-#~ msgstr "Lägg till {0} {1}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-#~ msgstr ""
-#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är "
-#~ "närvarande"
-
-#~ msgid "Rotate {0} {1}"
-#~ msgstr "Rotera {0} {1}"
-
-#~ msgid "Remove relation member {0} {1}"
-#~ msgstr "Radera relationsmedlem {0} {1}"
-
-#~ msgid "removing reference from relation {0}"
-#~ msgstr "raderar referens från relation {0}"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "parameter {0} > 0 krävs. Erhöll {1}."
-
-#~ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-#~ msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "ingen senaste version funnen. Historiken är tom."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Kunde inte läsa filen ''{0}''.<br> Felet är: <br>{1}</html>"
-
-#~ msgid ""
-#~ "There are unsaved changes in {0} layer. Discard the changes and continue?"
-#~ msgid_plural ""
-#~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
-#~ msgstr[0] ""
-#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
-#~ "fortsätt?"
-#~ msgstr[1] ""
-#~ "Det finns osparade ändringar i {0} lager. Förkasta ändringarna och "
-#~ "fortsätt?"
-
-#~ msgid "Download referrers from OSM..."
-#~ msgstr "Laddar ner referenser från OSM..."
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Konflikter under nerladdningen"
-
-#~ msgid "Download referrers..."
-#~ msgstr "Laddar ner referenser..."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "till {0} primitiva"
-#~ msgstr[1] "till {0} primitiva"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Sammanfoga de markerade primitiva med ett annat lager"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.<html>"
-#~ msgstr "<html>Konflikter i lager ''{0}''.<br>Du måste lösa dem först.<html>"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parametern ''{0}'' får inte vara null"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Kan inte ångra kommando \"{0}\" eftersom lager \"{1}\" inte längre är "
-#~ "närvarande"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametern ''{0}'' får inte vara null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "oförväntat returvärde. Erhöll {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
-
-#~ msgid "There's no primitive with version {0} in this history."
-#~ msgstr "Det finns inget primitiv med version {0} i denna historik"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "ingen tidigaste version funnen. Historiken är tom."
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "ingen senaste version funnen. Historiken är tom."
-
-#~ msgid ""
-#~ "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Kunde inte öppna \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "Välj om datan ska hämtas som ett nytt lager"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "Du håller på att starta {0} webbläsarfönster.<br>Detta kan både fylla din "
-#~ "skärm med webbläsarfönster<br>och ta ett tag att slutföra."
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 krävs, har {0}"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "Hittade inte något objekt med id {0} i det nuvarande datasettet"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Vänligen välj en korrekt latitud i området -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Vänligen välj en korrekt longitud i området -90..90"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Vänligen välj en korrekt latitud i området -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Vänligen välj en korrekt longitud i området -90..90"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Stäng dialogrutan men skapa ingen nod"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Växla helskärmsvy"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Helskärmsvy"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!"
-#~ msgstr "<html>Kan inte öppna mapp.<br>Välj en fil!"
-
-#~ msgid "Opening {0} files..."
-#~ msgstr "Öppnar {0} filer..."
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr ""
-#~ "<html>Det finns olösta konflikter i lager ''{0}''.<br>Du måste lösa dem "
-#~ "först.</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
+#~ "Varning: Oväntad versions nummer för JOSM i revisionsfilen, värdet är "
 #~ "''{0}''"
-#~ msgstr ""
-#~ "VARNING: felaktigt skriven URL till API:t. Länkar till info- och "
-#~ "historiksidorna kommer antagligen inte att fungera. API-URL:en är \"{0}\"."
-
-#~ msgid "Travel"
-#~ msgstr "Turism"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" är inte sluten, och kan därför inte förenas med andra ytor."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Det kopierade datat innehåller inkompletta primitiv. Vid inklistring "
-#~ "kommer inkompletta primitiv att plockas bort. Vill du klistra in data "
-#~ "utan de inkompletta primitiven?"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Ange filtersträng"
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Mönstersyntaxfel: Mönster {0} i {1} är inte giltigt!"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Skapa multipolygoner med ett klick, mycket enklare än det vanliga sättet "
-#~ "via relationsredigeraren."
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Dra en delsträcka för att skapa en rektangel. Ctrl+dra för att flytta en "
-#~ "delsträcka längs dess normal."
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Varning: Rensar bort sträcka {0} eftersom antalet noder föll till mindre "
-#~ "än 2. Nuvarande är {1}"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Markera en enda sluten sträcka med minst fyra noder."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "En OSM-sträcka med rollen \"från\" <tt>from</tt> krävs i en "
-#~ "vändningsbegränsning."
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "En OSM-sträcka med rollen \"till\" <tt>to</tt> krävs i en "
-#~ "vändningsbegränsning."
-
-#~ msgid "Splits the way"
-#~ msgstr "Delar upp sträckan"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Detta kontrollerar så att det inte finns några sträckor som har samma "
-#~ "taggar och samma nod-koordinater"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Dubblera sträckor med förskjutning"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Klicka för att hämta det för närvarande valda området"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Förenkla yta (ta bort {0} nod)"
-#~ msgstr[1] "Förenkla yta (ta bort {0} noder)"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Välj åtminstone två noder att slå samman, eller en nod som ligger nära en "
-#~ "annan nod."
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Kunde inte para ihop angiven länk eller id med vald tjänsteleverantör. "
-#~ "Försök igen."
-
-#~ msgid "Download Object..."
-#~ msgstr "Hämta hem objekt."
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Ogiltigt ID angivet. Objektet kan inte hämtas"
-
-#~ msgid "Download Object"
-#~ msgstr "Hämta hem objekt"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "Hämtar de primitiver som refererar till en av de valda primitiverna"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Vare sig <strong>{0}</strong> eller <strong>{1}</strong> är "
-#~ "aktiverat.<br>Välj mellan att antingen hämta OSM-data, GPX-data eller "
-#~ "bådadera.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Varning: Lagret ''{0}'' existerar Ej längre, Kan Ej lösa konflikten för "
-#~ "primitiven ''{1}''."
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr ""
-#~ "Det verkar som om JOSM kraschade förra gången. Vill du återställa datan?"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (spegel)"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 26529)
+++ applications/editors/josm/i18n/po/tr.po	(revision 26530)
@@ -10,7 +10,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-19 17:46+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-08-11 11:55+0000\n"
+"Last-Translator: kulkke <Unknown>\n"
 "Language-Team: Türkçe\n"
 "Language: \n"
@@ -19,10 +19,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:42+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:40+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -37,12 +37,12 @@
 msgstr "Yardım"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "hatalı dosya atlandı URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -97,6 +97,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -120,5 +121,5 @@
 msgstr "Uyarı"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
@@ -126,10 +127,10 @@
 "etmemektedir."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Yanlış linkler atlanıldı: URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "JOSM’den çık"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -383,6 +384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -409,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -415,7 +416,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -423,5 +425,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -630,5 +632,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -878,5 +880,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -885,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1064,6 +1066,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1214,5 +1216,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1428,6 +1430,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2065,5 +2067,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2368,7 +2370,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Veriyi indir"
@@ -2619,5 +2621,5 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
 
@@ -2742,10 +2744,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2909,5 +2911,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3468,5 +3470,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3517,40 +3519,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
+msgid "Set {0}={1} for node ''{2}''"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
-#, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
-#, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3672,4 +3674,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr ""
@@ -3968,6 +3971,6 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
 msgstr ""
 
@@ -4004,5 +4007,5 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
@@ -4106,5 +4109,5 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
@@ -4204,5 +4207,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4220,8 +4223,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4361,50 +4364,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Mercator"
@@ -4429,80 +4446,100 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
 msgstr ""
 
@@ -4721,45 +4758,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5033,5 +5070,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5056,5 +5093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5065,5 +5102,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5472,5 +5509,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5536,5 +5573,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "Karayolu"
@@ -5542,5 +5579,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5548,10 +5585,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "suyolu"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "arazi kullanımı"
@@ -5561,5 +5598,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5572,5 +5609,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5582,5 +5619,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5939,5 +5976,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6046,4 +6083,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6142,5 +6180,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6183,5 +6221,5 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
@@ -6468,6 +6506,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
 msgstr ""
 
@@ -6695,9 +6733,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
+msgid "Keep my coordinates"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
+msgid "Keep their coordinates"
 msgstr ""
 
@@ -6754,6 +6792,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6775,6 +6813,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7159,5 +7197,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7321,5 +7359,5 @@
 msgctxt "filter"
 msgid "Text"
-msgstr "metin"
+msgstr "Metin"
 
 #. column header: inverted filter
@@ -7394,5 +7432,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7606,7 +7644,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "bilinmeyen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7870,5 +7938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7888,5 +7956,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7903,5 +7971,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -7909,5 +7977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr ""
@@ -7950,5 +8018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7956,5 +8024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8146,5 +8214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8244,5 +8312,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Kullanıcı"
@@ -9236,5 +9303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9416,5 +9483,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9557,4 +9624,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr ""
@@ -9566,4 +9634,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
 msgstr ""
 
@@ -9826,9 +9900,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9837,13 +9911,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9856,18 +9930,19 @@
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Değerleri Değiştir?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9876,5 +9951,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9883,5 +9958,5 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9889,27 +9964,31 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Özellikler/Üyelikler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Seçili objenin özellikleri"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9918,62 +9997,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10037,8 +10116,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
 
@@ -10061,5 +10142,5 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
 msgstr[0] ""
 msgstr[1] ""
@@ -10389,9 +10470,4 @@
 msgstr "Dışalım işlemi esnasında {0} çakışma oldu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10431,10 +10507,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:112
 msgid "Load relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
 
@@ -10708,37 +10778,4 @@
 msgstr "Tip"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "bilinmeyen"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10854,20 +10891,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr ""
@@ -10959,5 +10996,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
+msgid "Changeset:"
 msgstr ""
 
@@ -11493,8 +11530,8 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -11896,4 +11933,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -11919,11 +11957,4 @@
 "<html>Cannot upload {0} objects in one request because the<br>max. changeset "
 "size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
 
@@ -12000,38 +12031,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Renkleri Ayarla"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Varsayılan"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Renk seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "İsim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Tanım: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12042,9 +12073,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12052,26 +12083,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12079,8 +12110,8 @@
 msgstr[0] "{0} rut, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12088,12 +12119,12 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps noktası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12101,10 +12132,10 @@
 msgstr[0] "{0} iz, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12112,78 +12143,78 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12194,11 +12225,11 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12206,6 +12237,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12214,27 +12245,27 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "işaretli noktalardan imleçler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} isim verilen izler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Sesi içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12244,29 +12275,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} daki ses imleçleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Görüntüleri içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12370,5 +12401,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12378,57 +12409,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Mozaik Yükle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Bütün Mozaikleri Yükle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -12966,15 +13005,15 @@
 msgstr "JPEG görüntüsü (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps imleçi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "imleç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -12982,26 +13021,26 @@
 msgstr[0] "{0} {1} imleçten oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Sesi işaretleyecek herhangi bir nesne yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Görünen metin ve ikonları sabitle."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Sesi Eşle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Eşlemeye yardımcı bir ses duyduğunuzda, çalan sesi durdurunuz."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13009,14 +13048,14 @@
 msgstr "Ses {0} noktasında eşlendi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Çalan tabakada eşleme yapılamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Ses dosyasının başlangıcını işaretle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13042,13 +13081,13 @@
 msgstr "Yeni ses imleci oluşturulamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Bu imleç için tanımlanan link gösterilemedi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Linkin gösterilmesinde hata"
@@ -13986,82 +14025,82 @@
 msgstr "Renkler"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Yön oklarını çiz"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Sadece yolun başında"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Segment sıra numaralarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "İndirilen alan için sınırları çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Seçim modunda sanal kavşakları çiziniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Pasif tabakaları başka renkte çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Düzgün harita grafikleri (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS Noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Yol segmentleri için yön ipuçları çiz."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Her segment için kendi yolu buyunca sıra numarası çiz."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Daha düzgün harita grafikleri için ''antialiasing'' uygula  ."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Server’dan gelen bilginin sınırlarını çiz ."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Pasif tabakaları farklı renklerde çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14069,15 +14108,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM Data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Genel ayarları kullan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14088,47 +14163,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Herhangi bir segment içeri alınmadıysa çizgileri zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Geniş gps noktaları çiz."
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -14136,5 +14203,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14158,5 +14225,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14199,5 +14266,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14211,38 +14278,18 @@
 msgstr "Ayak"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Hızlı Çizim (kötü görünür)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr ""
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr ""
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14252,10 +14299,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14263,10 +14310,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -14275,25 +14322,25 @@
 "''-1'' yap."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Maximum uzunluk (metre)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14301,14 +14348,14 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Minimum uzaklık (pixel)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "GPS noktaları için geniş nokta çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14316,13 +14363,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14330,27 +14377,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15012,5 +15077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
@@ -15102,5 +15167,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Reset"
@@ -15378,5 +15443,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
+msgid "Always update without asking"
 msgstr ""
 
@@ -15761,5 +15826,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15788,9 +15853,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr ""
@@ -16070,6 +16135,6 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
 msgstr ""
 
@@ -16392,5 +16457,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
 
@@ -16602,5 +16667,5 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
@@ -16990,4 +17055,9 @@
 msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17782,4 +17852,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -17899,4 +17971,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18464,5 +18550,5 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
+msgid "Allows to filter out unnecessary GPS tracks"
 msgstr ""
 
@@ -34763,4 +34849,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -34777,6 +34864,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -34795,15 +34882,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "kısaltılmış sokak isimleri"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "noktada bir tek yön etiketi var"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "noktada bir köprü etiketi var"
@@ -34814,12 +34901,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "noktada yanlış bir yol etiketi var"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr ""
@@ -34828,16 +34915,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "referansı olmayan araçyolu"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "geçici araç yolu tipi"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "yanlış yazılmış anahtar adı"
@@ -34847,10 +34934,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "bisikletler için etiketli döner yol"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "yürüyüş yolu etiketli yürüyüş yolu"
@@ -34859,10 +34946,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "ayrı şeridi olan döner yol"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "yolda bariyer var"
@@ -34871,35 +34958,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "yürüyüş yolu için max hız"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "+ işaretli tabaka etiketi"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "sokak isimleri ss içerir"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "tipi olmayan ilişki"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "isimsiz restoran"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "nadir etiket kombinasyonu"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35004,117 +35100,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Haritası"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr ""
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Sicilya - İtalya"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35359,5 +35465,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
+msgid "Upload canceled"
 msgstr ""
 
@@ -35460,9 +35566,9 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35480,23 +35586,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35504,26 +35640,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Bilgi"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35531,5 +35695,5 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
+msgid "Fix addresses"
 msgstr ""
 
@@ -35640,9 +35804,9 @@
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr ""
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr ""
@@ -35741,17 +35905,34 @@
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr ""
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr ""
@@ -36382,28 +36563,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36521,6 +36709,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
 msgstr ""
 
@@ -37404,5 +37592,5 @@
 msgstr ""
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37412,17 +37600,17 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Bu tabaka için çizgiler arasını birleştir."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Bu tabaka için çizgileri birleştirme."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Çizim seçeneklerini seçiniz"
@@ -37574,5 +37762,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37580,10 +37768,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37592,5 +37780,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37599,6 +37787,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37607,9 +37795,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -37768,71 +37956,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -37840,32 +38036,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -37900,6 +38090,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38030,30 +38220,43 @@
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -38748,5 +38951,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -38763,5 +38966,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39493,17 +39696,17 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr ""
@@ -39517,36 +39720,32 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
 
@@ -40168,5 +40367,5 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
+msgid "Download referrers for the chosen relation and its members."
 msgstr ""
 
@@ -41134,4 +41333,21 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41351,6 +41567,6 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
@@ -41597,5 +41813,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
+msgid "Open an editor for the selected turn restriction"
 msgstr ""
 
@@ -42165,5 +42381,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42549,1682 +42765,7 @@
 msgstr ""
 
-#~ msgid "Update Plugins"
-#~ msgstr "Eklentileri Güncelle"
-
-#~ msgid "Preparing..."
-#~ msgstr "Hazırlanıyor..."
-
-#~ msgid "Do not show again"
-#~ msgstr "Tekrar Gösterme"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Eklenti kaldırılamıyor, Lütfen JOSM u edindiğiniz yere danışın"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "Beklenmedik bir hata oluştu.\n"
-#~ "\n"
-#~ "Bu bir kodlama hatasıdır. Eğer en son versiyonu kullanıyorsanız, lütfen "
-#~ "hatayı bildiriniz"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Lütfen {0} 'daki problemi bildiriniz"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Hatayı oluşturan adımları belirtiniz (Mümkün olduğunca detaylı)!"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Hatayı bildirmeden önce JOSM'un ve eklentilerin son versiyonunu edinmeyi "
-#~ "deneyiniz."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Aşağıdaki bilgiyi eklediğinizden emin olunuz:"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı."
-
-#~ msgid "Preparing data..."
-#~ msgstr "Bilgiler hazırlanıyor..."
-
-#~ msgid "Error during parse."
-#~ msgstr "Ayrıştırma sırasında hata oluştu."
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr ""
-#~ "OSM server'ına bağlantı sağlanamadı. Lütfen internet bağlantınızı kontol "
-#~ "ediniz."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra "
-#~ "yapınız."
-
-#~ msgid "Unknown version"
-#~ msgstr "Bilinmeyen versiyon"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-bileşene erişelemdi."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> in içi boş"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>. eleman ile bağlantı bulunamadı."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Geçersiz obje bulundu id=0"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Gerekli özellik eksik \"{0}\"."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Yanlış tanımlı kavşak bilgisi"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
-
-#~ msgid "Commit comment"
-#~ msgstr "Açıklamayı Kabul Ediniz"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Açılıyor..."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Bu bu bilgiyi desteklemiyor."
-
-#~ msgid "Uploading..."
-#~ msgstr "Yükleniyor..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Hatalı kullanıcı adı veya şifre."
-
-#~ msgid "Enter Password"
-#~ msgstr "Enter Password"
-
-#~ msgid "Aborting..."
-#~ msgstr "İptal Edildi..."
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr "Uyarı - {0} eklentisi istenildi. Eklenti artık gerekli değil."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Eklenti Bulunamadı: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Bu uyarı yapıldıktan sonraki gün sayısını 'pluginmanager.warntime' dan "
-#~ "değiştirebilirsin.<br>"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi."
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "lütfen ilk olarak istenilen koordinatı giriniz."
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Lütfen bu yer için bir isim giriniz."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
-
-#~ msgid "zoom level"
-#~ msgstr "zoom seviyesi"
-
-#~ msgid "x from"
-#~ msgstr "x burdan"
-
-#~ msgid "to"
-#~ msgstr "buraya"
-
-#~ msgid "y from"
-#~ msgstr "y burdan"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Bilgi Kaynağı ve Tipi"
-
-#~ msgid "Download Area"
-#~ msgstr "Alanı indir"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Fare veya Ctrl+ok tuşları ile /./  zoom ve pan yapabilirsin."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Varolan Grup ''{0}''"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "OSM serverına bağlanılıyor..."
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Boş değer anahtarı sildi."
-
-#~ msgid "Edit Properties"
-#~ msgstr "Özellikleri Değiştir"
-
-#~ msgid "Create new relation"
-#~ msgstr "Yeni ilişki oluştur"
-
-#~ msgid "Edit new relation"
-#~ msgstr "Yeni ilişkiyi düzenle"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "İlişki Düzenle #{0}"
-
-#~ msgid "Occupied By"
-#~ msgstr "Meşgul Eden"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etiket (Boş değerler etiketi siler)"
-
-#~ msgid "Add Selected"
-#~ msgstr "Seçileni Ekle"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Seçili bütün objeleri üye olarak ekle"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
-
-#~ msgid "Members: {0}"
-#~ msgstr "Üyeler: {0}"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "İçeri taşıma esnasında karşıklık oluştu."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Serverın cevabı tanımlanamdı."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Server'a bağlantı kurulamadı."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Tazelemek için Yenile düğmesine basınız"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr "Seçili objelerin durumlarını geçmiş listesinde seçili olana çevir"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Henuz Yapılmadı."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Yazarlar: {0}"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Seçili tabakayı sil."
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "Kayıt edilmemiş çalışmalar var. Buna rağmen tabaka silinsin mi?"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "Gerçekten bütün tabakayı silmek istiyor musunuz?"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Göster/Sakla Metin/İkon"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "Bu takayı seçili tabakanın altına koy."
-
-#~ msgid "Layers: {0}"
-#~ msgstr "Tabakalar: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Seçim listesini yenile."
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Komut Yığını: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Çelişkileri Birleştir."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Çelişkileri Çözümle"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Çeşişkiler: {0}"
-
-#~ msgid "name"
-#~ msgstr "sism"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "nokta"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "{0} noktalı iz"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} {1} izden oluşur"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} nokta"
-
-#~ msgid "Timespan: "
-#~ msgstr "Zaman_aralığı: "
-
-#~ msgid "Length: "
-#~ msgstr "Uzunluk: "
-
-#~ msgid "Images for {0}"
-#~ msgstr "{0} için görüntüler"
-
-#~ msgid "Read GPX..."
-#~ msgstr "GPX Oku..."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Noktalrı için {0} x {1} zaman yok"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS başlangıç: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS bitiş: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "şu anki delta: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "zaman dilimi farkı: "
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "görüntü"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} izde var."
-
-#~ msgid "Sync clock"
-#~ msgstr "Saati eşle"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "EXIF zamanı \"{0}\" dosyasında yok."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS ünitesi zamandilimi (resim farkı)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Girilen zaman ayrıştırılamadı."
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} silindi.)"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "Yer imleçleri okunamadı."
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "Yer imleçleri yazılamadı."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "OSM için asıl link"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM için Login adı (email) ."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
-
-#~ msgid "Base Server URL"
-#~ msgstr "Asıl Link"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM kullanıcı_adı (e-mail)"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM şifresi"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>UYARI: şifre konfigürasyon dosyasında düz metin olarak "
-#~ "tutulmaktadır.<br>şifre internet üzerinde aynı şekilde düz metin olarak "
-#~ "gönderilmektedir. <br><b>Değerli bir şifre kullanmayınız.</b></html>"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Önceden tanımlanmış ayarları etkinleştir"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "İlk ayarların kaynağı gösteriliyor"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Etiketleme ayarları kaynakları dosyası, yardım için:http://josm."
-#~ "openstreetmap.de/wiki/TaggingPresets."
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Yeni bir etiketleme ayar dosyası ekle."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Etiketleme ayar kaynakaları"
-
-#~ msgid "Keep backup files"
-#~ msgstr "Backup dosyalarını sakla"
-
-#~ msgid "Download List"
-#~ msgstr "İndirme listesi"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "{0} sitesinden indirilen eklenti"
-
-#~ msgid "No plugin information found."
-#~ msgstr "Eklenti bilgisi bulunamadı."
-
-#~ msgid "Configure Sites..."
-#~ msgstr "Siteleri Ayarla..."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "site-josm.xml veya Wiki Pages ekle."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Bütün eklentiler güncel."
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Şu eklentileri güncelle:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}: Versiyon {1}{2}"
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download the current "
-#~ "version by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Eklenti arşivi zaten mevcut. Yeni listeyi indirmek istiyormusunuz? eski "
-#~ "liste silinecek!\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Eklentiler zaten mevcut"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Eklentinin silinmesinde hata: {0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "Eklentinin açıklaması okunamadı: {0}"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Şu eklentileri indir?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Eksik eklentileri yükle"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Proxy kullan"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonymous"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "Proxy Ayarları"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Proxy server host"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Proxy server port"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Proxy server kullanıcı_adı"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Proxy server şifresi"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "GPX dosyası okunurken sessiz imleç oluştur."
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)."
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr ""
-#~ "Çizgilerin çizilmesi için maximum uzunluk (metre) . Herşeyin çizilmesi "
-#~ "için '-1' yap."
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>Kısayollar program ilk açıldığında belirlenirdeğişiklikleri görmek "
-#~ "için JOSM u <b>Yeniden Başlatmalısınız</b> </p>"
-
-#~ msgid ""
-#~ "<p>Furthermore, the shortcuts are activated when the actions are assigned "
-#~ "to a menu entry of button for the first time. So some of your changes may "
-#~ "become active even without restart --- but also without collistion "
-#~ "handling. This is another reason to <b>restart</b> JOSM after making any "
-#~ "changes here.</p>"
-#~ msgstr ""
-#~ "<p>BAzı kısayollar ilgili düğmeye ilk defa basıldığında aktif oluryani "
-#~ "yaptığınız değişiklik program yeniden açılmadanda aktif olabilir fakat "
-#~ "herhangi bir sorun oluşmaması için programı  <b>yeniden başlatmalısınız</"
-#~ "b>.</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>Kısayollar konusunda dikkat edilmesi gereken konu ise kısayol "
-#~ "tanımlamasındaJava nın tanıdığı klavyeler esas alınmalıdır. Farklı klavye "
-#~ "tiplerinde yapılacak  kısayol atamaları gerçekleşmeye bilir veya program "
-#~ "tarafında çakışma olarak algılanabilir.</p>"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>Anlayışınız için teşekkürler</p>"
-
-#~ msgid ""
-#~ "<p>The last page lists the modifier keys JOSM will automatically assign "
-#~ "to shortcuts. For every of the four kinds of shortcuts there are three "
-#~ "alternatives. JOSM will try those alternative in the listed order when "
-#~ "managing a conflict. If all alternatives would result in shortcuts that "
-#~ "are already taken, it will assign a random shortcut instead.</p>"
-#~ msgstr ""
-#~ "<p>Son sayfada listelenen kısayollar otomatik olarak atanacaktır Her "
-#~ "dörtlü grup kısayol için üç alternatif vardır. JOSM her alternatifi "
-#~ "deneyecektir, eğer sonuç alınmazsa rastgele bir atama yapılacaktır.</p>"
-
-#~ msgid ""
-#~ "<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-#~ "encountered.</p>"
-#~ msgstr ""
-#~ "<p>Sanal düzenleyci pasif haldedir, aktif hale gelince bütün kısayollar "
-#~ "pasif olacaktır.</p>"
-
-#~ msgid "layer not in list."
-#~ msgstr "tabaka listede yok."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Dosya Aç (ham gps, eğer .gpx ise)"
-
-#~ msgid "Set the language."
-#~ msgstr "Dil seçimi."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametreler belirlenmiş bir sıra ile okunur, emin olmak istiyorsanız\n"
-#~ "bir harita yükleyiniz --selection"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "--download=<bbox> indirmek yerine osm://<bbox> kullanabilirsin\n"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Tercihler klasörü açılamıyor: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "Tercihler dosyasında hata. Eskisi yedek olarak kullanılıyor {0}."
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "Güncellenen eklentiler aktif olacak"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Güncellenen eklentilerin aktif hale getirilemedi. JOSM un var olanların "
-#~ "üzerine yazma yetkisi varmıdır kontrol ediniz."
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objede çakışma var:"
-
-#~ msgid "my version:"
-#~ msgstr "versiyonum:"
-
-#~ msgid "their version:"
-#~ msgstr "onların versiyonu:"
-
-#~ msgid "resolved version:"
-#~ msgstr "çözülen versiyon:"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Ayrıştırma esnasında hata"
-
-#~ msgid "File not found"
-#~ msgstr "Dosya bulunamadı"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Şu eklentilerde sorun var:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Eklenti güncelledi. Programı yeniden açınız."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Eklenti indirilemedi: {0} ve {1}"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ."
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "İlişkiÜyesinikaldır"
-
-#~ msgid "Rotate"
-#~ msgstr "Dönder"
-
-#~ msgid "Move"
-#~ msgstr "Taşı"
-
-#~ msgid "Change"
-#~ msgstr "Değiştir"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "Kaldır \"{0}\" için {1} ''{2}''"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "Kaldır \"{0}\" için {1} {2}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Sil {1} {0}"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "Sil {0} {1}"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Seçim \"{0}\" ,\"{1}\" ilişkisi tarafından {2} rölü için kullanılıyor.\n"
-#~ "İlişkiden sil?"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "İlişkilerde Karışıklık"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "Seçim \"{0}\", ilişki \"{1}\" tarafından kullanılıyor.\n"
-#~ "İlişkiden Sil?"
-
-#~ msgid "Split way segment"
-#~ msgstr "Yol segmentini ayrıştır"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz "
-#~ "başka objeler onu kullanıyor olabilir. <br>Gerçekten silmek "
-#~ "istiyormusunuz?"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Çözümle {0} karşıklıkları {1} objelerinde"
-
-#~ msgid "true"
-#~ msgstr "doğru"
-
-#~ msgid "false"
-#~ msgstr "yanlış"
-
-#~ msgid "position"
-#~ msgstr "pozisyon"
-
-#~ msgid "different"
-#~ msgstr "farklı"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Derece Dakika Saniye"
-
-#~ msgid "S"
-#~ msgstr "G"
-
-#~ msgid "N"
-#~ msgstr "K"
-
-#~ msgid "W"
-#~ msgstr "B"
-
-#~ msgid "E"
-#~ msgstr "D"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "Projeksiyon \"{0}\" şu alanlar için tasarlandı\n"
-#~ "enlem  46.1° ve 57° arası.\n"
-#~ "Lütfen farklı bier projeksiyonu seçiniz\n"
-#~ "eğer Fransız WMS kullanmıyorsanız.\n"
-#~ "Bu mesajdan sonra herhangi bir şey yükleme."
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert Zone (Fransa)"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Alan stili yol kapalı değil."
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "multipoligon yolu ''{0}'' kapalı değil."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "İlişkide boş üye."
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "''{0}'' üyesini ilişkiden sil."
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "Yol ''{0}'' iki noktadan az içeriyor."
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Yol-Değil ''{0}'' multipolygon içinde."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Multipoligon için dış yol yok ''{0}''."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "iç yol ''{0}'' dışarıda."
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "İç yol stili ''{0}'' multipolygon ."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Dış yol stili ''{0}'' bulunamadı."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Hata: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Uyarı: {0}"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Yardım Dosyası"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Dosyaya isim verilemedi \"{0}\"."
-
-#~ msgid "History of Element"
-#~ msgstr "Elemanın Geçmişi"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "OSM yolları ve kavşakları için geçmiş bilgisini göster."
-
-#~ msgid "File could not be found."
-#~ msgstr "Dosya bulunamadı."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Seçili yollar farklı ilişkilere sahip, buna rağmen birleştirmek "
-#~ "istiyormusunuz?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Farklı sınıflardaki yolları birleştir?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Bütün yollar boştu"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "Genel ayarlar için tercihler sayfasını aç."
-
-#~ msgid "gps track description"
-#~ msgstr "gps iz tanımı"
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "Rol tabanlı ilişki bütün yeni yollara kopyalandı.\n"
-#~ "Gerek duyulursa kontrol edilmeli"
-
-#~ msgid "Create a new map."
-#~ msgstr "Yeni harita oluştur."
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "OSM ye yükle..."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "Bütün değişiklikleri OSM server'ına yükle."
-
-#~ msgid "Upload these changes?"
-#~ msgstr "Değişiklikleri yükle?"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz."
-
-#~ msgid "Uploading data"
-#~ msgstr "Bilgi yükleniyor"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Yanlış cümleler: "
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Kontoltoplamı hatası: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Bilinmeyen cümleler: "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Sıfır koordinatlar: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA içeri alınmasında hata!"
-
-#~ msgid "Load Selection"
-#~ msgstr "Seçili alanı yükle"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontak {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "İndiriliyor..."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Link okunamadı: \"{0}\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Link ayrıştırılamadı: \"{0}\""
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Lütfen bir aramametni giriniz."
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "or için eksik argüman."
-
-#~ msgid "Missing argument for not."
-#~ msgstr "not için eksik argüman."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Parantezlerin kapanması beklenir."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "bazı kavşaklar zaten hizada"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Program Hatası: tabakalar için durumlar kontrol edilemediLütfen hata "
-#~ "olarak bildiriniz"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Döküman açık değil Kayıt yapılamaz."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Yedek dosyası oluşturulamadı."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Bilinmeyen dosya uzantısı."
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "Kaydetme sırasında bir hata oluştu."
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "Yedek dosyası içeri alınırken hata oluştu."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Silmek için tıklayınız. Shift: yol segmentini siler. Alt: kullnılmayan "
-#~ "kavşakları silmebir yol silerken. Ctrl:referans objelerini sil"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Dikdörtgen çizmek için bir yol segmentini sürükleyin."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Objeyi seç,taşı ve dönder"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Seçimde sadece yollar olmalı."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz."
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>EPSG:4326 projeksiyonunu kullanıyorsunuz, projeksiyon istenmeyen "
-#~ "sonuçlar<br> verebilir özellikle diktörgenel hizalamalarda."
-#~ "<br>Projeksiyonu değiştirmeniz önerilir.<br>Devam etmek istiyormusunuz?"
-
-#~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "Lütfen üç nokta veya üç nokta içeren bir yol seçiniz."
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Noktalar daire içinde değiller."
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Ondalık derece kullan."
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Negatif sayılar Batı/Güney yarımküreyi gösterir ."
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "Yolların kavşakları herhangi nesneye yapışık değil."
-
-#~ msgid "Dupe {0} nodes into {1} nodes"
-#~ msgstr "{0} kavşalarını {1} kavşakları üzerine getir"
-
-#~ msgid "Jump back."
-#~ msgstr "Geri Atla."
-
-#~ msgid "Previous Marker"
-#~ msgstr "Önceki İmleç"
-
-#~ msgid "Play previous marker."
-#~ msgstr "Önceki imleci oynat."
-
-#~ msgid "Slower Forward"
-#~ msgstr "Yavaş İleri Götür"
-
-#~ msgid "Next Marker"
-#~ msgstr "Diğer İmleç"
-
-#~ msgid "Play next marker."
-#~ msgstr "Diğer imleci oynat."
-
-#~ msgid "Jump forward"
-#~ msgstr "İleri atla"
-
-#~ msgid "Faster Forward"
-#~ msgstr "Hızlı İleri"
-
-#~ msgid "No data imported."
-#~ msgstr "İçeri bilgi alınamadı."
-
-#~ msgid "Data Layer"
-#~ msgstr "Bilgi Tabakası"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Lütfen en az bir indirme görevi seçiniz"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "Değişiklikleri Uygulama"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Çift Yol"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Seçili yolları çiftle."
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Sırasız yolları çiftleyemem."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Çiftli yol oluştur"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Yeni hata oluşturulamadı. Sonuç: {0}"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Gerçekten  ''yapılmış'' olarak işaretlemek istiyormusunuz?"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "OpenStreet Hatalarını Aç ve otomatik indirmeyi etkinleştir"
-
-#~ msgid "load data from API"
-#~ msgstr "API den veri yükle"
-
-#~ msgid "change the selection"
-#~ msgstr "Seçimi değiştir"
-
-#~ msgid "change the viewport"
-#~ msgstr "Görünüm yerini değiştir"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "Uzak kontol hareketlerini, manual kontrol et"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr ""
-#~ "JOSM un diğer uygulamalar tarafında kontrol edilmesini sağlayan API."
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Uzak kontrol eklenti ayarları."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Uzak Kontrol bu bilgisayarda 8111 numaralı portu dinler. Port "
-#~ "değişmezdiğer uygulamaların eklenti ile haberleşmesi için kullanılır."
-
-#~ msgid "Permitted actions"
-#~ msgstr "Onaylanan Hareket"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Lütfen aranacak bir metin giriniz"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Arama sonucu server dan alınamadı"
-
-#~ msgid "near"
-#~ msgstr "yakın"
-
-#~ msgid "zoom"
-#~ msgstr "yaklaş"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "TCX Dosyası içeri al..."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "TCX Dosyasını GPS izi olarak içeri al"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi "
-#~ "oynat.Seçim:Klik"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Yön indexi'{0}' bulunamadı"
-
-#~ msgid "OpenLayers"
-#~ msgstr "Tabakaları aç"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Aktif seçimi veya bütün veriyi onayla."
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Seçili hataları onar."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Seçili hatalara gelecek sefere bak."
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "Bu test, iki farklı yol, suyolu veya demiryolunun farklı tabakalarda "
-#~ "kesişiminifakat kesişen nokta içermemelerini kontrol eder"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Etiketsiz ve bağlı olmayan yollar"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Geçersiz etiket/anahtar kombinasyonu"
-
-#~ msgid "Painting problem"
-#~ msgstr "Renklendirme problemi"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Renklendirme notlarını kontro let."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Harita renklendirme hata durumunu kontrol et."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Hatalar içeren veri. Yinede yükle?"
-
-#~ msgid "start"
-#~ msgstr "başla"
-
-#~ msgid "end"
-#~ msgstr "bitiş"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "Düğme '{0}' için çift tanım - düğme iptal edilecek"
-
-#~ msgid "Slippy Map"
-#~ msgstr "Hareketli Harita"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Mozaik Durumunu Göster"
-
-#~ msgid "Request Update"
-#~ msgstr "Güncelleme İste"
-
-#~ msgid "image not loaded"
-#~ msgstr "görüntü yüklenemedi"
-
-#~ msgid "error loading metadata"
-#~ msgstr "meta veri yüklemesinde hata"
-
-#~ msgid "requested: {0}"
-#~ msgstr "istendi: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "güncelleme isteğinde hata"
-
-#~ msgid "Tile Sources"
-#~ msgstr "Mozaik Kaynakları"
-
-#~ 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 ""
-#~ "Seçilen yollar indirilen alanın dışındada noktalara sahip.\n"
-#~ "Bu işlem yanlışlıkla nokta silinmesine sebep olabilir.\n"
-#~ "Devam etmek istiyormusunuz?"
-
-#~ 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] "Seçin {0} kadar yol içeriri. Basitleştireceğinize emin misiniz?"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "AgPifoJ ile görüntü aç..."
-
-#~ msgid "One of the selected files was null !!!"
-#~ msgstr "Seçilen yollardan birisi null !!!"
-
-#~ msgid "{0} were found to be gps tagged."
-#~ msgstr "{0} gps için etiketlenecek bulundu."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotagged imajlar"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "geotagged fotoğraflar"
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "Şu zaman dilimindeyim: "
-
-#~ msgid "Open an other photo"
-#~ msgstr "Başka bir fotoğraf aç"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr "<html>GPS alıcımın resmini çizebilirim.<br>yardımcı olurmu?</html>"
-
-#~ msgid "Update position for: "
-#~ msgstr "Burası için pozisyon güncelle: "
-
-#~ msgid "All images"
-#~ msgstr "Bütün imajlar"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "exif pozisyonu olmayan imajlar"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "imaj henuz etiketlenmedi"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX izi yüklendi"
-
-#~ msgid "Show Author Panel"
-#~ msgstr "Yazar Panosunu göster"
-
-#~ msgid "Open User Page"
-#~ msgstr "Kullanıcı Sayfasını Göster"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "Kullanıcı sayfasını tarayıcıda aç"
-
-#~ msgid "Select User's Data"
-#~ msgstr "Kullanıcı verisi seç"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "Seçimi kullanıcı verisi ile değiştir"
-
-#~ msgid "Please select some data"
-#~ msgstr "lütfen bir veri seçiniz"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "Yazar panosunu kullanan bir kullanıcı seçiniz"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "Hata, anonim kullanici ile çalışmaz"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender seçenekleri"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Metacarta linkinden Rektifiye dosyayı indiriniz"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Metacarta Map Rectifier imaj id"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "rectifier id={0}"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS Eklenti Tercihleri"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "WMS eklenti menusundeki, WMS server listesini değiştir"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS linki"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS linki (Varsayılan)"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Menu ismi ve WMS linki kullanınız"
-
-#~ msgid "Copy Default"
-#~ msgstr "Varsayılanı kopyala"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Kopyalamak için bir satır seçiniz."
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "WMS mozaiği indir {0}"
-
-#~ msgid "Exception occurred"
-#~ msgstr "İstisna oluştu"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "WMS tabakasının pozisyonunu ayarla"
-
-#~ msgid "help"
-#~ msgstr "yardım"
-
-#~ msgid "Help / About"
-#~ msgstr "Yardım / Hakkında"
-
-#~ msgid ""
-#~ "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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "WMS tercihler sekmesinden şu ayarları yapabilirsiniz. Veri ekle, sil, "
-#~ "düzelt gibi - menuler ekranında görünecektir.\n"
-#~ "\n"
-#~ "Aynı zamanda aşağıdaki şemayı kullanarak, ileri tercihler kısmındada "
-#~ "yapabilirsiniz:\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"
-#~ "Tam WMS link formatı örnek (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?"
-#~ "request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/"
-#~ "jpeg\n"
-#~ "\n"
-#~ "Metacarta Map Rectifier için http://labs.metacarta.com/rectifier/ ,  "
-#~ "sadece gerekli 'id' ye ihtiyacınız var.\n"
-#~ "Metacarta Map Rectifier menusunu eklemek için şu linki örnek olarak, 73 ü "
-#~ "sizin 'id' niz ile değiştirin:\n"
-#~ "http://labs.metacarta.com/rectifier/wms.cgi?"
-#~ "id=73&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&\n"
-#~ "format=image/png"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "WMS Eklenti Yardımı"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Grid orjin lokasyonu"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Grid dönüklük"
-
-#~ msgid "World"
-#~ msgstr "Dünya"
-
-#~ msgid "Grid layout"
-#~ msgstr "Grid yerleşimi"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Grid tabakası:"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigasyon"
-
-#~ msgid "standard"
-#~ msgstr "standard"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Düzeltme)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK+)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Goods"
-#~ msgstr "mallar"
-
-#~ msgid "Motorboat"
-#~ msgstr "Motorboat"
-
-#~ msgid "Boat"
-#~ msgstr "Boat"
-
-#~ msgid "Bridleway"
-#~ msgstr "At yolu"
-
-#~ msgid "Cycleway"
-#~ msgstr "Bisiklet yolu"
-
-#~ msgid "Footway"
-#~ msgstr "Yürüyüş Yolu"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "İz derecesi 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "İz derecesi 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "İz derecesi 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "İz derecesi 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "İz derecesi 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "gezme düzenle"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Dağ gezisi"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Dağ gezisi düzenle"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "istenen dağ gezisi"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "istenen dağ gezisi düzenle"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "Dağ Gezisi"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Dağ Gezisi düzenle"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Asma Köprü"
-
-#~ msgid "Portcullis"
-#~ msgstr "Demir parmaklık"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Su yolu noktası"
-
-#~ msgid "Station"
-#~ msgstr "İstasyon"
-
-#~ msgid "park_and_ride"
-#~ msgstr "park_ve_sür"
-
-#~ msgid "Shop"
-#~ msgstr "Alışveriş"
-
-#~ msgid "Accomodation"
-#~ msgstr "Kalınacak Yerler"
-
-#~ msgid "map"
-#~ msgstr "harita"
-
-#~ msgid "citymap"
-#~ msgstr "şehir haritası"
-
-#~ msgid "hikingmap"
-#~ msgstr "gezirehberi"
-
-#~ msgid "bicyclemap"
-#~ msgstr "bisikletharitası"
-
-#~ msgid "board"
-#~ msgstr "yiyecek noktası"
-
-#~ msgid "football"
-#~ msgstr "futbol"
-
-#~ msgid "rugby"
-#~ msgstr "rugby"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Motor Sporlar"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Motor Sporları Düzenle"
-
-#~ msgid "Football"
-#~ msgstr "Amerikan Futbolu"
-
-#~ msgid "Edit Football"
-#~ msgstr "Amerikan Futbolu Düzenle"
-
-#~ msgid "Rugby"
-#~ msgstr "Rugby"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Rugby Düzenle"
-
-#~ msgid "unitarianist"
-#~ msgstr "unitarianist"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "Kablo Miktarı"
-
-#~ msgid "Amenities"
-#~ msgstr "hoş mekan"
-
-#~ msgid "Charge"
-#~ msgstr "Para Değişim"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}."
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "Ayarla {0}={1} için {2} ''{3}''"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "Ayarla {0}={1} için {2} {3}"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "İz derecesi 1 düzenle"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "İz derecesi 2 düzenle"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "İz derecesi 3 düzenle"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "İz derecesi 4 düzenle"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "İz derecesi 5 düzenle"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "istenen Dağ Gezisi"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "istenen Dağ Gezisi düzenle"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "Zor Dağ Gezisi"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Zor Dağ Gezisi düzenle"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Asma Köprü düzenle"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Demir parmaklık düzenle"
-
-#~ msgid "Edit Station"
-#~ msgstr "İstasyon Düzenle"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr ""
-#~ "Değişikleri henüz kaydedilmemiş. Boş verip devam etmek istiyor musun?"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Kaydedilmemiş Değişiklikler"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Kaydet ve Çık"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Yeni nokta için koordinat giriniz."
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Bütün çakışmaları için yeni değerler gir."
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Ne olursa olsun: Birleştir"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Çakışmaları Çöz"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "İndirirken çakışmalar oldu"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "parametre ''{0}'' zero (null) olamaz"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Tarayıcında Aç"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Sadece JOSM Online Yardım dosyalaları düzenlenebilir"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Sayfa {0} yüklerken hata oluştu"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "Yardım sayfası yok. <A HREF=\"{0}\">english</A> olarak oluştur."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Yardım sayfası yok. <A HREF=\"{0}\">english</A> ya da <A HREF="
-#~ "\"{1}\">türkçe</A> olarak oluştur."
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Birleştirmek için en azından iki nokta seçmen lazım."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Neyse Birleştir"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor "
-#~ "musun?"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu."
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Sadece iki nokta olabilir"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Sadece bir nokta seçili"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "parametre ''{0}'' zero (null) olamaz"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Yardım sayfası yok. <A HREF=\"{0}\">English</A> olarak oluştur."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Yardım sayfası yok. <A HREF=\"{0}\">English</A> ya da <A HREF="
-#~ "\"{1}\">türkçe</A> olarak oluştur."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametre ''{0}'' zero (null) olamaz"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Okunamadı \"{0}\""
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr ""
-#~ "OSM server'ına bağlantı sağlanamadı. Lütfen internet bağlantınızı kontol "
-#~ "ediniz."
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Lütfen -90..90 aralığında bir enlem değeri girin"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Lütfen -90..90 aralığında geçerli bir boylam değeri girin"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Lütfen -90..90 aralığında geçerli bir enlem değeri girin"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Lütfen -90..90 aralığında bir boylam değeri girin"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Tam Ekran Görünümüne geç"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Tam Ekran Görünüm"
-
-#~ msgid "Closed Way"
-#~ msgstr "Kapatılmış Yol"
-
-#~ msgid "Update Selection"
-#~ msgstr "Seçimi Güncelle"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 gerekiyordu, {0} elde edildi"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Otomatik olarak üstüste gelen alanlar birleştirildi"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Dosya okunamadı ''{0}''.<br> Hata: <br>{1}</html>"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Birleşme Alanları: Kısayolları Kaldır"
-
-#~ msgid "Fix relations"
-#~ msgstr "İlişkileri düzelt"
-
-#~ msgid "Errors during Download"
-#~ msgstr "İndirme sırasında hatalarla karşılaşıldı"
-
-#~ msgid "Download Object..."
-#~ msgstr "Nesneyi indir..."
-
-#~ msgid "Download Object"
-#~ msgstr "Nesneyi indir"
+#~ msgid "Change values?"
+#~ msgstr "Değerleri Değiştir?"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "nadir etiket kombinasyonu"
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 26529)
+++ applications/editors/josm/i18n/po/uk.po	(revision 26530)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
-"PO-Revision-Date: 2011-07-29 12:50+0000\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
+"PO-Revision-Date: 2011-07-31 13:03+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,10 +18,10 @@
 "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: 2011-07-31 11:44+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:44+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -36,12 +36,12 @@
 msgstr "Довідка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ігнорування невірної адреси файлу: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -96,6 +96,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -119,14 +120,14 @@
 msgstr "Попередження"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Параметр \"downloadgps\" не приймає імена файлів або URL-адреси файлів"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ігнорування невірної адреси: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -139,13 +140,13 @@
 "більш старішу (сумісну з Java 5) версію JOSM.</li></ul>Більш докладно:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "Вийти з JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "Продовжити, спробувати у будь-якому випадку"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -165,7 +166,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -175,6 +176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -205,5 +206,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -391,6 +392,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -417,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -423,7 +424,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -431,5 +433,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -642,5 +644,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -889,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -896,5 +898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1088,6 +1090,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1238,5 +1240,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1470,6 +1472,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2157,5 +2159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2485,7 +2487,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "Отримати дані"
@@ -2743,7 +2745,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"Ігнорування винятків, оскільки завантаження було скасовано. Виняток: {0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2886,10 +2887,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -3064,5 +3065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3677,6 +3678,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "Знайдено дані, що викликають підозру. Все одно надсилати?"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3727,40 +3728,40 @@
 msgstr "Точки з {0} змінено"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Вилучити \"{0}\" для точки ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "Вилучити \"{0}\" для лінії ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "Вилучити \"{0}\" для зв’язку ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "Встановити {0}={1} для точки ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "Встановити {0}={1} для лінії ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "Встановити {0}={1} для зв’язку ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "Вилучити \"{0}\" для {1} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3891,4 +3892,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "Підтвердження вилучення"
@@ -4213,9 +4215,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Попередження: Збій ініціалізації налаштувань. Неможливо замінити файл "
-"налаштувань {0} на файл з типовими налаштуваннями."
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4251,8 +4251,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Попередження: несподіваний номер версії JOSM у файлі виправлень, "
-"значення:''{0}''"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4358,10 +4356,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM очікував знайти елемент [{0} {1}] в наборі даних, але його там немає. "
-"Будь ласка, повідомте про це на http://josm.openstreetmap.de. Це не критична "
-"помилка, але необхідно зберегти дані, перш ніж продовжити роботу."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4468,5 +4463,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4486,8 +4481,8 @@
 msgstr "мультиполігон"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4636,52 +4631,64 @@
 msgstr "Географічна WGS84"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
 msgstr ""
-"Попередження: не вдалося відкрити вхідний потік для ресурсу ''/data/{0}''. "
-"Неможливо завантажити решітку NTF <-> RGF93"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "Зона Lambert 4 (Франція)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} на {2} град.)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (Корсика)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "Зона Lambert CC"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "Зона Lambert CC9 (Франція)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-зона (Естонія)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "Проекція Меркатора"
@@ -4710,81 +4717,101 @@
 "для коду ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (Польща)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "Зона PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Польща))"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "Зона PUWG 2000 {0} (Польща)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Швейцарська проекція"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (Латвія TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "Зона UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "Північна"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "Південна"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "Півкуля"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "Зсув 3.000.000м на схід"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Форт Marigot Гваделупа 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Гваделупа Sainte Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Мартиніка Форт Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "Reunion RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Гвіана RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "Франція UTM (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "Система координат UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -5010,45 +5037,45 @@
 msgstr "Цей тест перевіряє правільність мультиполігонів"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "Лінія, що позначає ділянку, не замкнена"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "У мультиполігона немає зовнішньої лінії"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "Немає стилю для мультиполігону"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "Відсутній стиль у зв’язку мультиполігону"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "Стиль внутрішньої лінії — мультиполігон"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "Невідповідність стилю зовнішньої лінії"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "Мультиполігон не замкнений"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "Внутрішня ліня мультиполігону знаходиться ззовні"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "Перетин між лініями мультиполігону"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "Непридатна роль члена мультиполігону"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "Не-лінія в мультиполігоні"
@@ -5320,5 +5347,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5343,5 +5370,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5352,5 +5379,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5764,5 +5791,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5830,5 +5857,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "дорога"
@@ -5836,5 +5863,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5842,10 +5869,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "водний шлях"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "землекористування"
@@ -5855,5 +5882,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5868,5 +5895,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5880,5 +5907,5 @@
 msgstr "громадський транспорт"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6256,5 +6283,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6365,4 +6392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6468,5 +6496,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6511,11 +6539,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>Як альтернативу, ви можете ввести <strong>адресу квадрата</strong> для "
-"окремого квадрата у форматі <i>zoomlevel/x/y</i>, наприклад: <i>15/256/223</"
-"i>. Адреси квадратів в форматі <i>zoom,x,y</i> або <i>zoom;x;y</i> також "
-"вірні.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6809,9 +6833,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Список об’єднаних елементів. Вони замінять Мої елементи коли рішення про "
-"об’єднання буде прийнято."
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -7061,10 +7083,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "Залишити мої координати"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "Залишити чужі координати"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7122,6 +7144,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7143,6 +7165,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7550,5 +7572,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7794,5 +7816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -8023,7 +8045,37 @@
 msgstr "mapcss"
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr "невідомо"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "Невідомо"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -8305,5 +8357,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -8323,5 +8375,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -8338,5 +8390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "Завантажити з сервер неповних членів вибраних зв’язків"
@@ -8344,5 +8396,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "Завантажити неповних членів"
@@ -8385,5 +8437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8391,5 +8443,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8590,5 +8642,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8691,5 +8743,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "Користувач"
@@ -9690,5 +9741,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9870,5 +9921,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -10021,4 +10072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "Тільки мої набори змін"
@@ -10031,4 +10083,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "Тільки набори змін користувача з іменем"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10324,9 +10382,9 @@
 msgstr "Недійсний URL запиту отримання набору змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "Додати параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -10336,13 +10394,13 @@
 msgstr[2] "Це змінить {0} об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "Пусте значення вилучає теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -10355,18 +10413,19 @@
 msgstr "<інший>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "Змінити значення?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr "Перезаписати ключі"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "Замінити"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -10377,5 +10436,5 @@
 "Новий ключ вже використовується, перезаписати його значення?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10386,5 +10445,5 @@
 msgstr[2] "Зміна властивостей {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -10394,27 +10453,31 @@
 msgstr[2] "Це змінить до {0} об’єктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "Будь ласка, оберіть ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "Будь ласка, оберіть значення"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "Будь ласка, оберіть об’єкти для зміни параметрів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "Параметри/Членство"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "Параметри обраних об’єктів."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10423,62 +10486,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "Розташування"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Параметрів: {0} / Членів: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "Параметри / Члени"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "Змінити зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "Вилучити із зв’язку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Ви дійсно бажаєте вилучити цей елемент зі зв’язку {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "Вилучити обраний ключ зі всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "Вилучити параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "Додати нову пару ключ/значення до всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "Правити значення обраного ключа для всіх об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "Перейти до OSM-Вікі, щоб отримати довідку про теґ (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "Запустити оглядач для огляду довідки по виділеному об’єкту"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "Вибрати зв’язок із основного виділення"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "Виділити членів виділеного зв’язку"
@@ -10546,10 +10609,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Попередження: помилку проігноровано тому що завдання скасовано. Помилка: {0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10573,8 +10637,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "Завантажується {0} неповний нащадок з {1} батьківських зв’язків"
-msgstr[1] "Завантажуються {0} неповних нащадки з {1} батьківських зв’язків"
-msgstr[2] "Завантажуються {0} неповних нащадків з {1} батьківських зв’язків"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10932,11 +10995,4 @@
 msgstr "Підчас імпорту виникло {0} конфлітів"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-"Попередження: Виключення проігноровано, оскільки завдання скасовується. "
-"Помилка: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10977,12 +11033,4 @@
 msgid "Load relation"
 msgstr "Завантажити зв’язок"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
-"Попередження: ігнорування винятку, оскільки завдання було скасовано. "
-"Виняток: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -11267,37 +11315,4 @@
 msgstr "Тип"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "Невідомо"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -11429,20 +11444,20 @@
 msgstr "Координати"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "Історія точки {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "Історія лінії {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "Історія зв’язку {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "Перезавантажити історії з сервера"
@@ -11538,6 +11553,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "Набір змін"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -12152,17 +12167,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>Операція надсилання та/або збереження одного шару зі змінами<br>була "
-"скасована або не вдалась.</html>"
 msgstr[1] ""
-"<html>Операції надсилання та/або збереження {0} шарів зі змінами<br>були "
-"скасовані або не вдались.</html>"
-msgstr[2] ""
-"<html>Операції надсилання та/або збереження {0} шарів зі змінами<br>були "
-"скасовані або не вдались.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12614,4 +12622,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12644,13 +12653,4 @@
 "запитом, тому що<br>перевищено макс. розмір набору змін {1} на сервері "
 "''{2}''.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Потрібно <strong>кілька наборів змін</strong>, щоб надіслати на сервер "
-"{0} об’єктів. Я стратегію ви обираєте?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12731,38 +12731,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "Налаштувати колір"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "Типовий"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "Вибрати колір"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "Назва: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "Опис: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12774,9 +12774,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12784,26 +12784,26 @@
 msgstr "Опис"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "Період"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "Довжина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "Довжина: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12813,8 +12813,8 @@
 msgstr[2] "{0} маршрутів, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12824,12 +12824,12 @@
 msgstr[2] "{0} маршрутних точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12839,10 +12839,10 @@
 msgstr[2] "{0} треків, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Перетворити в шар даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12853,78 +12853,78 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Перетворено з: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "Завантажити з OSM дані уздовж цього треку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "Завантажити всі в межах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метрів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "Максимальна ділянка для одного запиту:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "Завантажити біля:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "тільки треки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "тільки маршрутні точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "треки та маршрутні точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12935,11 +12935,11 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На шарі відсутній трек GPX, щоб накласти звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12949,6 +12949,6 @@
 "будуть пропущені або перенесені на початок треку."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12958,27 +12958,27 @@
 "при розрахунку часу."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+msgstr "Налаштування креслення треків"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "Позначки з іменованих точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Іменовані точки треку з {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Імпортувати аудіо"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12990,29 +12990,29 @@
 "містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "Імпорт неможливий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудіофайли Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудіо-позначки з {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Імпорт зображень"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -13124,5 +13124,5 @@
 msgstr "Виявлені наступні проблеми:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -13135,57 +13135,65 @@
 "Змініть проекцію або вилучіть шар."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "Автомасштабування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "Автозавантаження квадратів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "Завантажити квадрат мапи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "Показати дані квадрату"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "Завантажити всі квадрати мапи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "Збільшити масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "Зменшити масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "Прив’язатися до розміру квадрата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "Очистити кеш квадратів мапи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "наблизитись для завантаження будь-яких квадратів мапи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "наблизитись для завантаження більшої кількості квадратів мапи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "збільшити масштаб, що побачити більше детелей"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "На цьому рівні масштабування квадрати мапи відсутні"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr "Підтримуються проекції EPSG:4326 та Mercator"
@@ -13743,10 +13751,10 @@
 msgstr "Зображення JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "позначка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
@@ -13755,5 +13763,5 @@
 msgstr[2] "позначок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13763,22 +13771,22 @@
 msgstr[2] "{0} складається з {1} позначок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 "В цьому шарі відсутні аудіо-позначки від яких можливо зробити зрушення."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "Показати текст/значки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Показати/приховати текст і значки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "Синхронізувати аудіо"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -13787,5 +13795,5 @@
 "синхронізації."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13793,14 +13801,14 @@
 msgstr "Аудіо синхронізовано у точці {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Не вдається синхронізувати в шарі, який програється."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "Встановити аудіо-позначку на позиції програвання"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13830,13 +13838,13 @@
 msgstr "Неможливо створити нову аудіо-позначку."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Сталася помилка при спробі показати URL для цієї позначки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(посилання: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "Помилка показу URL"
@@ -14889,53 +14897,53 @@
 msgstr "Кольори"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "Показувати стрілки напрямку"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "Тільки на початку лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "Стрілки для одностороннього руху."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "Показувати порядкові номери відрізків"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "Показувати межі завантажених даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "Показувати віртуальні точки в режимі вибору"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "Показувати неактивні шари іншим кольором"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Згладжені лінії (антіаліасінг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "Креслити тільки зовнішні контури ділянок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "Показувати напрямок на відрізках ліній."
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
@@ -14944,20 +14952,20 @@
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показувати порядкові номери на всіх відрізках лінії."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Застосувати згладжування мапи."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Показувати межі ділянки, завантаженої з сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -14965,9 +14973,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "Показувати неактивні шари даних іншим кольором."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14977,15 +14985,51 @@
 "обраному стилі."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "Дані OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "Авто"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Назва"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Опис"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "Нічого"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "Використовувати загальні налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14996,49 +15040,41 @@
 msgstr "Всі"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "Локальні файли"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "Нічого"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "Показувати лінії, навіть якщо немає імпортованих відрізків."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "Показувати GPS великими точками"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr ""
 "Показати значення HDOP (зниження точності в горизонтальній площині) колом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Швидкість (червоний = повільно, зелений = швидко)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 "Напрямок (червоний = захід, жовтий = північ, зелений = схід, синій = південь)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+msgstr "Дата треку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним кольором (може бути визначено для іменованих шарів)"
@@ -15046,5 +15082,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -15068,5 +15104,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -15109,5 +15145,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -15121,38 +15157,18 @@
 msgstr "Пішки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "Створювати мітки читаючи GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "Швидке креслення (виглядає гірше)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr "Динамічний діапазон кольорів заснований на обмеженнях даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "Авто"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "Назва"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "Опис"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "Всі"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -15163,10 +15179,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "Показувати лінії між точками GPS"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -15176,10 +15192,10 @@
 "щоб показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальна довжина для локальних файлів (в метрах)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -15188,20 +15204,20 @@
 "показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "Максимальна довжина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Показувати стрілки на лініях, що з’єднують точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -15210,5 +15226,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -15217,14 +15233,14 @@
 "Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "Мінімальна відстань (в пікселях)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "Показувати точки GPS великими."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -15234,13 +15250,13 @@
 "Менеджері Шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "Позначати колір відрізків та точок треку в залежності від швидкості."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr "Розфарбовувати точки та треки за напрямом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -15250,27 +15266,45 @@
 "Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
-msgstr ""
+msgstr "Розфарбовувати точки та відрізки треку за їх часом."
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "Забарвлення треку та точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+msgstr "Розфарбовувати точки та відрізки треку за обмеженнями на дані."
+
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "Маркування маршрутних точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15965,11 +15999,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSM буде завжди прослуховувати порт 8111 на  localhost. Цей порт не "
-"змінюється тому, що він пов’язаний із зовнішніми застосунками, які "
-"спілкуються із JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -16058,5 +16089,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "Скинути"
@@ -16355,6 +16386,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "Завжди оновлювати не питаючи"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16784,5 +16815,5 @@
 msgstr "Новий зв’язок"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16811,9 +16842,9 @@
 msgstr "Заготовки пошуку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "Показати тільки ті, що застосовуються для виділеного"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "Шукати в теґах"
@@ -17114,9 +17145,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr ""
-"Сталася помилка під час розбору файлу GPX {0}. Тільки частина файлу буде "
-"доступною"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17193,8 +17222,10 @@
 "header. Can''t redirect. Aborting."
 msgstr ""
+"Неочікувана відповідь від HTTP-сервера. Отримано {0} відповідь без "
+"''Location'' у заголовку. Неможливо переадресувати. Припинення."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
 msgid "Too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgstr "Виявлено забагато переадресувань на URL завантаження. Припинення."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
@@ -17206,5 +17237,5 @@
 #, java-format
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
-msgstr ""
+msgstr "Помилка читання з ''{0}''. Сервер відповів кодом стану — {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -17455,8 +17486,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr ""
-"Prolog документа OsmChange ще не написаний. Будь ласка, напишіть його "
-"спочатку."
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17689,9 +17718,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"Відсутні обов’язкові атрибути елементу ''bounds''. Отримано minlon=''{0}'', "
-"minlat=''{1}'', maxlon=''{3}'', maxlat=''{4}'', origin=''{5}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -18103,4 +18130,9 @@
 msgid "Save user and password (unencrypted)"
 msgstr "Зберегти логін і пароль (незашифрованими)"
+
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
@@ -19034,4 +19066,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -19167,4 +19201,18 @@
 msgstr "Помилка завантаження XML схеми"
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -19758,6 +19806,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "Дозволяє відфільтровувати не потрібні GPX-треки"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
@@ -36132,4 +36180,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -36146,6 +36195,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -36164,15 +36213,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "скорочена назва вулиці"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "теґ oneway у точці"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "теґ bridge у точці"
@@ -36183,12 +36232,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "невірний теґ highway у точці"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "Безіменна дорога без класифікації"
@@ -36197,16 +36246,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "дорога без номера"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "тимчасовий тип дороги"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "помилка в ключі"
@@ -36216,10 +36265,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "велодоріжка з теґом bicycle"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "пішохідна доріжка з теґом foot"
@@ -36228,10 +36277,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr "окрема смуга для велосипедів (велодоріжка)"
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "на шляху перешкоди для велосипедів"
@@ -36240,35 +36289,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "максимальна швидкість руху транспорту дозволена на пішохідній доріжці"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "теґ layer зі знаком +"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "назва вулиці містить ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "зв’язок без типу"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "ресторан без імені"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "незвичайна комбінація теґів"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -36373,118 +36431,128 @@
 msgstr "Geoimage.at"
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr "Топографічні мапи MSR"
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr "Міські мапи MSR"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "Чехія CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "Чехія UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "Мапи NPE"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "Мапи NPE (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "Японія MLIT (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "Японія MLIT (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "Японія MLIT (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "Японія MLIT (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr "Італия – Лоді"
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr "Італія – Сицилія"
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 — Італія"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps (Франція)"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr "PNOA Spain (Іспанія)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr "Основна мапа Естонії (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr "Орто мапа Естонії (Maaamet)"
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr "Мулти мапа Естонії (Maaamet)"
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr "Fugro (Данія)"
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr "Stevns (Данія)"
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr "Пангасінан (Філіппіни HiRes)"
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
+msgstr ""
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
@@ -36736,6 +36804,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "Надсилання скасовано"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -36837,9 +36905,9 @@
 msgstr "(Висоти відсутні)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr "Неможливо зберегти налаштування"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr "Налаштування FastDraw"
@@ -36857,25 +36925,53 @@
 msgstr "Максимальна кількість точок на 1 км"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr "Налаштування FastDraw"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr "Зберегти налаштування"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr "Не можливо прочитати налаштування"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-"Натисніть Enter для спрощення або збереження; Ctrl-Enter — для збереження "
-"разом із теґами, Вверх/Вниз для налаштування спрошення"
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -36887,26 +36983,54 @@
 "нової лінії"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr "Швидке креслення"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr "Режим швидкого креслення"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr "Будь ласка, пересуньте мишу для креслення нової лінії"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "Інформація про втулок"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr "Неможливо поставити точку за межами світу"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr "Креслити лінію мишею"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -36914,6 +37038,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "Виправити адреси"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -37024,9 +37148,9 @@
 msgstr "Показати неповні адреси"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "елементів"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "елементи відсутні"
@@ -37128,17 +37252,34 @@
 msgstr "Виділити всі адреси з неповними даними."
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "Властивості Шару"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "Імпортувати зображення"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "Імпортувати зображення прив’язане до координат"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "Під час створення шару зображення сталась помилка: "
@@ -37866,31 +38007,35 @@
 msgstr "Виберіть загальне"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "Автоматичні джерела"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"Втулок cadastre-fr використовує  для захоплення клавішу F11,\n"
-"яка зазвичай включає повноекранний режим.\n"
-"Ви бажаєте назначити на клавішу F11 функцію захопленя?"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "Відновити  дію захоплення клавішею F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM зупиняється, щоб зміни вступили в силу."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -38018,8 +38163,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr ""
-"Замінити оригінальний білий фон на колір фону, заданий у налаштуваннях JOSM."
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38946,5 +39090,5 @@
 msgstr "Додати шар EGPX"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -38954,17 +39098,17 @@
 "вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "Налаштувати креслення ліній"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "Креслити лінії між точками цього шару."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "Не креслити лінії між точками цього шару."
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "Вибрати варіанти креслення ліній"
@@ -39116,5 +39260,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr "Жодного вибраного набору правил!"
@@ -39122,10 +39266,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr "Немає набору правил"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -39136,5 +39280,5 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -39145,6 +39289,6 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -39155,9 +39299,9 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr "Файл не знайдено:\n"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -39320,71 +39464,79 @@
 msgstr "Створити/оновити граф"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr "Граф"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr "Налаштування втулка Граф, який дозволяє візуалізувати дорожній граф."
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr "Набір правил"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr "Використовувати вбудовані набіри правил"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr "Тека із додатковими правилами:"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr "Обрати теку"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr "Транспортний засіб"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "Створити"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr "Відновити типові"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr "Візуалізація"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr "Креслити напрямки окремо"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr "Колір точки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr "Колір стрілок"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr "Нова закладка"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr "Дійсно вилучити \"{0}\"?"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr "Вилучення закладки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -39394,33 +39546,27 @@
 "Усі додані в  ручну чи скоректовані закладки будуть втрачені!"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr "Перевстановлення закладок"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr "Оберіть колір точки"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr "Виберіть колір стрілок"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr "Дорожній граф створений за допомогою втулка Граф"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
 msgstr "Шар Граф не об’єднується з іншими шарами"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr "Типова точка Графу"
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
-msgstr "Типовий відрізок Графу"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:35
@@ -39461,9 +39607,7 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
-msgstr ""
-"Значення параметрів поверхні не повинні містити наступні симовли: '','', "
-"''{'',  ''}'', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
+msgstr ""
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:38
@@ -39593,30 +39737,43 @@
 msgstr "Імпортується…"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr "ІнфоРежим"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr "Інформація GPX"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
 msgid "Hide this"
 msgstr "Сховати це"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
 msgid "Hide this&older"
 msgstr "Сховати це та старіше"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr "Немає відбитку часу"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr "км/г"
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr "Трек: "
@@ -40332,9 +40489,7 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
-"В залежності від вашої операційної системи або дистрибутиву, вам треба "
-"створити спочатку в’язку/гаманець для паролів."
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
@@ -40353,6 +40508,6 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
-msgstr "Перемістити у менеджер паролів та вилучити із файлу налаштувань"
+msgid "Transfer to password manager and remove from preference file"
+msgstr ""
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
@@ -41097,17 +41252,17 @@
 msgstr "Новий шар зображення з буфера обміну"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "Підтримувані формати файлів"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "Новий шар зображення з файлу…"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "Не можливо знайти об’єкт на мапі"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer не взмозі завантажити чи імпортувати зображення."
@@ -41121,43 +41276,33 @@
 msgstr "Дані буфера обміну не є зображенням"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "Файл з даними для калібрування малюнка не знайдено:"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(встановіть  для \"{0}\" yes/no/ask у налаштуваннях\n"
-"для керування автоматичним завантаженням калібрувальних даних)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "Бажаєте застосувати?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "Завантажити калібрувальний файл?"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "Він буде застосований автоматично."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr ""
-"Також, від цього моменту, калібрувальні файли будуть завантажуватись "
-"автоматично."
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"Встановіть  для \"{0}\" yes/no/ask у налаштуваннях\n"
-"для керування автоматичним завантаженням калібрувальних даних."
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -41782,6 +41927,6 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
-msgstr "Завантажити об’єкти, що посилаються на обраний зв’язок або його членів"
+msgid "Download referrers for the chosen relation and its members."
+msgstr ""
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
@@ -42773,4 +42918,21 @@
 msgid "Create a new signing key"
 msgstr "Створіть новий ключ для підписування"
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -43009,15 +43171,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
 msgstr[0] ""
-"Це обмеження на поворот відноситься до об’єкта, який був вилучений за межами "
-"цього редактора обмеження на поворот:"
 msgstr[1] ""
-"Це обмеження на поворот відноситься до {0} об’єктів, які були вилучені за "
-"межами цього редактора обмеження на поворот:"
-msgstr[2] ""
-"Це обмеження на поворот відноситься до {0} об’єктів, які були вилучені за "
-"межами цього редактора обмеження на поворот:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -43283,6 +43438,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "Відкрити редактор для обраного обмеження повороту"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -43920,6 +44075,6 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
-msgstr "Будуть виділені суміжні ліні. З точок виділення буде знято."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java:23
@@ -44323,2751 +44478,244 @@
 msgstr "Керуйте гоночним автомобілем на цьому шарі"
 
-#~ msgid "Do not show again"
-#~ msgstr "Не показувати знову"
-
 #~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Сталася непередбачена помилка.\n"
-#~ "Це пов'язано із помилкою в коді програми. Якщо ви запустили\n"
-#~ "останню версію JOSM, будь-ласка повідомте про неї розробникам."
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Будь-ласка, повідомте про баг в {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ "Ігнорування винятків, оскільки завантаження було скасовано. Виняток: {0}"
+
+#~ msgid ""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
 #~ msgstr ""
-#~ "Включіть ваші дії, що призвели до помилки (по можливості в деталях)!"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Переконайтеся, що долучили наступну інформацію:"
-
-#~ msgid "Unknown version"
-#~ msgstr "Невідома версія"
+#~ "Попередження: Збій ініціалізації налаштувань. Неможливо замінити файл "
+#~ "налаштувань {0} на файл з типовими налаштуваннями."
 
 #~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 #~ msgstr ""
-#~ "Неможливо зв'язатися із сервером OSM. Будь-ласка перевірте з'єднання з "
-#~ "мережею."
+#~ "Попередження: несподіваний номер версії JOSM у файлі виправлень, "
+#~ "значення:''{0}''"
 
 #~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
+#~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
-#~ "Сервер повернув помилку. Зменшіть область завантаження або повторіть "
-#~ "через деякий час."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> має порожній ref"
-
-#~ msgid "Error during parse."
-#~ msgstr "Помилка під час обробки."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Пропущено way, тому що він містить node, який не існує: {0}\n"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2}), {3} залишилось. Завантаження {4}: {5} (id: {6})"
-
-#~ msgid "Commit comment"
-#~ msgstr "Відправити коментар"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "Помилка обробки: невірна структура документу для файлу gpx"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "Відкриття набору змін (changeset)..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Невірний пароль або логін."
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Сервер не підтримує набори змін"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Відправка перервалася через помилку (чекатиму 5 секунд):"
-
-#~ msgid "Enter Password"
-#~ msgstr "Введіть пароль"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Незбережені змiни"
-
-#~ msgid "zoom"
-#~ msgstr "збільшення"
-
-#~ msgid "near"
-#~ msgstr "поряд з"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Неможливо отримати з серверу результати пошуку"
-
-#~ msgid "name"
-#~ msgstr "назва"
-
-#~ msgid "to"
-#~ msgstr "до"
-
-#~ msgid "y from"
-#~ msgstr "y від"
-
-#~ msgid "x from"
-#~ msgstr "x від"
-
-#~ msgid "zoom level"
-#~ msgstr "збільшення"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "Будь-ласка, введіть назву місця"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "Джерела даних і Типи"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ "JOSM очікував знайти елемент [{0} {1}] в наборі даних, але його там "
+#~ "немає. Будь ласка, повідомте про це на http://josm.openstreetmap.de. Це "
+#~ "не критична помилка, але необхідно зберегти дані, перш ніж продовжити "
+#~ "роботу."
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "Ви можете використовувати мишу чи клавіші Ctrl+стрілка/./, щоб "
-#~ "масштабувати/переміщати"
-
-#~ msgid "Download Area"
-#~ msgstr "Завантажити Область"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Редагувати властивості"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
+#~ "Попередження: не вдалося відкрити вхідний потік для ресурсу ''/data/"
+#~ "{0}''. Неможливо завантажити решітку NTF <-> RGF93"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "Залишити чужі координати"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "Залишити мої координати"
+
+#~ msgid "Change values?"
+#~ msgstr "Змінити значення?"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "Проекція не може бути прочитана з параметрів. Використовується EPSG:4326"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ "Попередження: помилку проігноровано тому що завдання скасовано. Помилка: "
+#~ "{0}"
+
+#~ msgid ""
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 #~ msgstr ""
-#~ "До уваги: Де-які зміни відбуваються під час завантаження нових даних з "
-#~ "сервера."
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "Деякі зміни не збережені. Відмовитись від змін та продовжити?"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Будь-ласка, введіть спочатку потрібні координати."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Спочатку виберіть закладку."
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "Група заготовок \"{0}\""
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "Порожнє значення знищує ключ."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "З'єднання з сервером OSM..."
-
-#~ msgid "Edit new relation"
-#~ msgstr "Редагувати нове відношення (relation)"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "Редагувати відношення (relation) #{0}"
-
-#~ msgid "Occupied By"
-#~ msgstr "Зайнято"
-
-#~ msgid "Create new relation"
-#~ msgstr "Створити нове відношення (relation)"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Теги (порожнє значення знищує тег)"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Завантажити всі неповні шляхи і точки у відношення"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Додати всі поточні обрані об'єкти як складові"
-
-#~ msgid "Add Selected"
-#~ msgstr "Додати вибрані"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Видалити складову в поточному рядку таблиці з цього відношення"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Натисніть Перевантажити для оновлення списку"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Неможливо з'єднатися з сервером"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Помилка при читанні відповіді з сервера."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Під час імпорту сталися конфлікти."
-
-#~ msgid "Members: {0}"
-#~ msgstr "Складові:{0}"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, можливо, пропущені деякі позначки."
+#~ "Попередження: Виключення проігноровано, оскільки завдання скасовується. "
+#~ "Помилка: {0}"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 #~ msgstr ""
-#~ "Спробуйте оновити JOSM  і всі модулі до найновішої версії, перед як "
-#~ "повідомити про помилку."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Знайдено <nd> елемент у non-way."
-
-#~ msgid "Preparing data..."
-#~ msgstr "Підготовка даних…"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Знайдено елемент <member> у non-relation"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "Відсутній обов’язковий параметр \"{0}\"."
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "Заборонений об'єкт з id=0"
-
-#~ msgid "Uploading..."
-#~ msgstr "Відправка…"
-
-#~ msgid "Preparing..."
-#~ msgstr "Підготовка…"
-
-#~ msgid "Aborting..."
-#~ msgstr "Припиняється…"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Введіть потрібний рядок для пошуку"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Помилка: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Попередження: {0}"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Неможливо відкрити папку з налаштуваннями: {0}"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
+#~ "Попередження: ігнорування винятку, оскільки завдання було скасовано. "
+#~ "Виняток: {0}"
+
+#~ msgid "Changeset"
+#~ msgstr "Набір змін"
+
+#~ msgid ""
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>Операція надсилання та/або збереження одного шару зі "
+#~ "змінами<br>була скасована або не вдалась.</html>"
+#~ msgstr[1] ""
+#~ "<html>Операції надсилання та/або збереження {0} шарів зі змінами<br>були "
+#~ "скасовані або не вдались.</html>"
+#~ msgstr[2] ""
+#~ "<html>Операції надсилання та/або збереження {0} шарів зі змінами<br>були "
+#~ "скасовані або не вдались.</html>"
+
+#~ msgid ""
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "Файл налаштувань містить помилки. Створюю резервну копію старих "
-#~ "налаштувань у {0}."
-
-#~ msgid "position"
-#~ msgstr "розташування"
-
-#~ msgid "different"
-#~ msgstr "відміни"
-
-#~ msgid "false"
-#~ msgstr "хибність"
-
-#~ msgid "true"
-#~ msgstr "істина"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert-зона (Франція)"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Градуси у Хвилинах Секундах"
-
-#~ msgid "S"
-#~ msgstr "Пд"
-
-#~ msgid "N"
-#~ msgstr "Пн"
-
-#~ msgid "W"
-#~ msgstr "Зх"
-
-#~ msgid "E"
-#~ msgstr "Сх"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
+#~ "<html>Потрібно <strong>кілька наборів змін</strong>, щоб надіслати на "
+#~ "сервер {0} об’єктів. Я стратегію ви обираєте?</html>"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "Завжди оновлювати не питаючи"
 
 #~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
 #~ msgstr ""
-#~ "Проекція \"{0}\" створена тільки для\n"
-#~ "широти між 46.1° та 57°.\n"
-#~ "Скористуйтесь іншою системою позиціювання, якщо\n"
-#~ "ви не користуєтесь сервером French WMS.\n"
-#~ "Не відправляйте будь-які данні після цього повідомлення."
+#~ "Сталася помилка під час розбору файлу GPX {0}. Тільки частина файлу буде "
+#~ "доступною"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr ""
+#~ "Prolog документа OsmChange ще не написаний. Будь ласка, напишіть його "
+#~ "спочатку."
 
 #~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
-#~ "УВАГА: дані про розташування посилаються\n"
-#~ "за межі поточної Lambert-зони.\n"
-#~ "Не відправляйте будь-які данні після цього повідомлення.\n"
-#~ "Відмініть ваші останні зміни, збережіть роботу\n"
-#~ "та створіть новий шар у новій зоні."
-
-#~ msgid "Rotate"
-#~ msgstr "Обертати"
-
-#~ msgid "Change"
-#~ msgstr "Змінити"
-
-#~ msgid "Move"
-#~ msgstr "Пересунути"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "ВИлучити {0} {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Вилучити {1} {0}"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Суперечливі залежності"
+#~ "Відсутні обов’язкові атрибути елементу ''bounds''. Отримано "
+#~ "minlon=''{0}'', minlat=''{1}'', maxlon=''{3}'', maxlat=''{4}'', "
+#~ "origin=''{5}''."
+
+#~ msgid "Upload cancelled"
+#~ msgstr "Надсилання скасовано"
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "Ви намагаєтесь вилучити вузол за межами завантаженої області.<br>Це може "
-#~ "призвести до проблем з іншими об’єктами (яких ви не бачите), що його "
-#~ "використовують.<br>Ви дійсно бажаєте його вилучити?"
-
-#~ msgid "Split way segment"
-#~ msgstr "Розділити відрізок шляху"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Невірна контрольна сума: "
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "File could not be found."
-#~ msgstr "Файл не знайдено."
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Деякі з точок знаходяться (майже) на одній лінії"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Все одно з'єднати"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Будь ласка, оберіть принаймні одну задачу для завантаження"
-
-#~ msgid "Email"
-#~ msgstr "Ел. пошта"
-
-#~ msgid "gps track description"
-#~ msgstr "Опис GPS треку"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Онлайн довідка JOSM"
-
-#~ msgid "History of Element"
-#~ msgstr "Історія елементу"
+#~ "Втулок cadastre-fr використовує  для захоплення клавішу F11,\n"
+#~ "яка зазвичай включає повноекранний режим.\n"
+#~ "Ви бажаєте назначити на клавішу F11 функцію захопленя?"
 
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
 #~ msgstr ""
-#~ "Будь ласка, виберіть принаймні одну точку, лінію чи групу. Тільки "
-#~ "завантажені на сервер елементи мають історію."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "З'єднати все одно"
+#~ "Замінити оригінальний білий фон на колір фону, заданий у налаштуваннях "
+#~ "JOSM."
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "Вибрані точки належать до різних груп. Ви все ще хочете з'єднати їх в "
-#~ "одну?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "З'єднати точки приналежні до різних груп в одну?"
-
-#~ msgid "Save and Exit"
-#~ msgstr "Зберегти і Вийти"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Невідоме розширення файлу"
+#~ "<html>Як альтернативу, ви можете ввести <strong>адресу квадрата</strong> "
+#~ "для окремого квадрата у форматі <i>zoomlevel/x/y</i>, наприклад: "
+#~ "<i>15/256/223</i>. Адреси квадратів в форматі <i>zoom,x,y</i> або <i>zoom;"
+#~ "x;y</i> також вірні.</html>"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "Відкрити редактор для обраного обмеження повороту"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "незвичайна комбінація теґів"
 
 #~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to history page "
-#~ "for OSM primitive will probably fail. API base URL is: ''{0}''"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
 #~ msgstr ""
-#~ "ПОПЕРЕДЖЕННЯ: несподіваний формат базового URL API. Перенаправлення на "
-#~ "сторінку історії OSM примітива, ймовірно, не виконано. Базовий URL API: "
-#~ "''{0}''"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "Використовувати десяткові градуси"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "Введіть координати нової точки"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "Збій ініціалізації API. Будь ласка, спробуйте знову пізніше."
+#~ "Список об’єднаних елементів. Вони замінять Мої елементи коли рішення про "
+#~ "об’єднання буде прийнято."
+
+#~ msgid "Both"
+#~ msgstr "Всі"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "Дозволяє відфільтровувати не потрібні GPX-треки"
+
+#~ msgid "Fix adresses"
+#~ msgstr "Виправити адреси"
 
 #~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "Поточне число змін перевищило максимальне, поточне — {0}, максимальне — "
-#~ "{1}"
+#~ "(встановіть  для \"{0}\" yes/no/ask у налаштуваннях\n"
+#~ "для керування автоматичним завантаженням калібрувальних даних)"
 
 #~ msgid ""
-#~ "Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "Довжина значення для теґу ''{0}'' на примітиві {1} перевищує максимально "
-#~ "допустиму довжину {2}. Значення довжини — {3}."
+#~ "Встановіть  для \"{0}\" yes/no/ask у налаштуваннях\n"
+#~ "для керування автоматичним завантаженням калібрувальних даних."
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
+#~ msgstr ""
+#~ "Також, від цього моменту, калібрувальні файли будуть завантажуватись "
+#~ "автоматично."
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "Файл з даними для калібрування малюнка не знайдено:"
 
 #~ msgid ""
-#~ "Warning: automatically truncating value of tag ''{0}'' on deleted "
-#~ "primitive {1}"
-#~ msgstr ""
-#~ "Попередження: автоматичне усікання значення теґу ''{0}'' на вилученому "
-#~ "примітиві {1}"
-
-#~ msgid "API initialization failed"
-#~ msgstr "Збій ініціалізації API"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "Точки не розташовані по колу"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Відкрити в оглядачі"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Можливо редагування лише сторінок з онлайн довідки JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Помилка під час завантаження сторінки {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Сторінка довідки відсутня. Створіть <A HREF=\"{0}\">англійською</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Сторінка довідки відсутня. Створіть <A HREF=\"{0}\">англійською</A> або "
-#~ "<A HREF=\"{1}\">вашою мовою</A>."
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "З'єднати лінії з різною приналежністю?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Всі лінії були порожні"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr ""
-#~ "Неможливо з'єднати вузли: треба вилучити лінію, яка все ще "
-#~ "використовується."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Вибрані лінії є членами різних груп. Ви все ще бажаєте їх з'єднати в одну?"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "Вибір повинен складатися тільки з ліній."
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr ""
-#~ "Будь ласка, виберіть одну або більше замкнутих ліній, які складаються що "
-#~ "найменше з чотирьох вузлів."
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "Натисніть для стирання. Shift: стерти сегмент шляху. Alt: не стирати "
-#~ "невикористані точки, стираючи шлях. Ctrl: стерти пов'язані об'єкти."
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "Тягніть сегмент шляху, щоб зробити прямокутник."
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>Неможливо прочитати файл ''{0}''.<br> Помилка: <br>{1}</html>"
-
-#~ msgid ""
-#~ "You''re about to launch {0} browser windows.<br>This may both clutter "
-#~ "your screen with browser windows<br>and take some time to finish."
-#~ msgstr ""
-#~ "У вас відкрито {0} вікон оглядача. <br>Це захаращує ваш екран вікнами "
-#~ "оглядача<br>та уповільнює систему."
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "Введіть широту в діапазоні -90..90"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "Будь ласка, введіть правильну широту в діапазоні -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "Введіть довготу в діапазоні -180..180"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "Будь ласка, введіть правильну довготу в діапазоні -180..180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "Закрити діалог, не створюючи нової точки"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Потрібен id>0, отримано {0}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "Конфлікти під час завантаження"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Завантажити елементи, які посилаються на один із виділених елементів"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "Ввімкнути/вимкнути повноекранний режим"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "Повноекранний режим"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Очікувався примірник  OsmDataLayer чи GpxLayer. Отримано \"{0}\"."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Параметр \"{0}\" не може бути пустим"
-
-#~ 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 ""
-#~ "Виділені лінії містять точки, що знаходяться за межами завантаженої\n"
-#~ "ділянки. Деякі точки можуть бути випадково вилучені.\n"
-#~ "Ви впевнені, що бажаєте продовжити?"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "Тільки дві ділянки можуть бути зараз об’єднані"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "лінія - \"{0}\" не замкнена і тому не може бути приєднаною."
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr ""
-#~ "Будь ласка, виберіть що найменше одну замкнену лінію для приєднання."
-
-#~ msgid "Create a new map."
-#~ msgstr "Створити нову мапу."
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "для {0} елемента"
-#~ msgstr[1] "для {0} елементів"
-#~ msgstr[2] "для {0} елементів"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "\"{0}\" не замкнена, і тому не може бути приєднана"
-
-#~ msgid "Fix relations"
-#~ msgstr "Виправити зв’язки"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "Введіть значення для всіх конфліктів."
-
-#~ msgid "Closed Way"
-#~ msgstr "Замкнена лінія"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "Розв’язати конфлікти"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "ПОПЕРЕДЖЕННЯ: неочікуваний формат базової адреси API. Перенаправлення на "
-#~ "сторінку з інформацією або з історією OSM-елементів не можливо. Базова "
-#~ "адреса API: \"{0}\""
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "Скопійовані дані містять неповні елементи. Після вставки неповні елементи "
-#~ "будуть вилучені. Чи бажаєте ви вставити дані без неповних елементів?"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>Кількість елементів у вашому наборі даних — {0}, <br>вони можуть "
-#~ "бути вилученими на сервері. В подальшому, якщо ви спробуєте вилучити "
-#~ "або<br>оновити їх, сервер скоріш за все сповістить про<br>конфлікт."
-#~ "<br><br>Натисніть <strong>{1}</strong> щоб перевірити стан цих "
-#~ "елементів<br>на сервері.<br>Натисніть <strong>{2}</strong> щоб ігнорувати."
-#~ "<br></html>"
-
-#~ msgid "Errors during Download"
-#~ msgstr "Помилки під час отримання даних"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "Вилучені або переміщені елементи"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "Будь ласка, введіть рядок фільтра."
-
-#~ msgid "Please enter a search string."
-#~ msgstr "Будь ласка, введіть рядок для пошуку."
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>В шарі ''{0}'' вже присутній конфлікт для елемента<br>''{1}''."
-#~ "<br>Неможливо додати цей конфлікт.</html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr ""
-#~ "Попередження: Шар''{0}''більше не існує. Неможливо вилучити конфлікт для "
-#~ "елемента ''{1}''."
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "Вилучення посилання зі зв’язку {0}"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr ""
-#~ "Увага: Очищення лінії {0}, тому що кількість точок стала менша 2. Поточне "
-#~ "значення {1}"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "Відновити {0} елемент"
-#~ msgstr[1] "Відновити {0} елементи"
-#~ msgstr[2] "Відновити {0} елементів"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "Помилка: Неочікуванний рядок ''{0}'' у переліку закладок з сервера"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Збій завантаження закладок з ''{0}'' у зв’язку з проблемами безпеки. "
-#~ "Помилка: {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "Відсутній результат об’єднання для об’єкта з ідентифікатором {0}"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr ""
-#~ "Помилка: Невірне подвійне значення ''{0}'' в рядку ''{1}'' в переліку "
-#~ "закладок з сервера"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "Отриманий об’єкт з ідентифікатором {0} та версією {1} видимий, хоча "
-#~ "первинний об’єкт з нижчою версією {2} не видимий. Ця невідповідність "
-#~ "неможлива. Отриманий об’єкт збережено. "
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Виявлено більше ніж одну лінію \"до\"."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Виявлено більше ніж одну лінію \"від\"."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Лінія, що показує межу ділянки, не замкнена."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Невідома роль ''{0}''."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Лінію «до» не знайдено."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Лінію «від» не знайдено."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Невідомий тип члегна ''{0}''."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Стиль для обмеження {0} не знайдено."
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>Неможливо створити закладку.<br>{0}</html>"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (Франція)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "Північна геодезична система UTM20"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "Збій під час об’єднання вилучених елеменів"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "Наступні елементи не можливо скопіювати у вказаний елемент,<br> тому що "
-#~ "вони вилучені із набору даних вказаного елемента:"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "Так, відновити їх теж"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "Ні, відмінити дію"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "Відновити додаткові точки?"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "Є {0} додатковий елемент, що входить до зв’язку {1}<br>, який вилучено на "
-#~ "сервері.<br><br>Ви бажаєте відновити його також?"
-#~ msgstr[1] ""
-#~ "Є {0} додаткових елементи, що входять до зв’язку {1}<br>, який вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити їх також?"
-#~ msgstr[2] ""
-#~ "Є {0} додаткових елементів, що входять до зв’язку {1}<br>, який вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити їх також?"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "Є {0} додаткова точка, що використовується в лінії {1}<br>, яку вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити цю точку також?"
-#~ msgstr[1] ""
-#~ "Є {0} додаткові точки, що використовуються в лінії {1}<br>, які вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити ці точки також?"
-#~ msgstr[2] ""
-#~ "Є {0} додаткових точок, що використовуються в лінії {1}<br>, які вилучено "
-#~ "на сервері.<br><br>Ви бажаєте відновити ці точки також?"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr ""
-#~ "<html>Під час з’єднання з сервером виникла помилка<br>Подробиці: {0}</"
-#~ "html>"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "Збій під час з’єднання з сервером"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "Відновити залежні елементи?"
-
-#~ msgid "Visible State:"
-#~ msgstr "Видимий:"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "не видимий (на сервері)"
-
-#~ msgid "visible (on the server)"
-#~ msgstr "видимий ( на сервері)"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "Фізично вилучити з локального набору даних"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "Лишити клон локальної версії"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
-#~ msgstr ""
-#~ "<html>Щоб врятувати ваше локальну версію, JOSM<br>встановить значення "
-#~ "ідентифікатора елемента {0} в 0.<br>Під час наступного надсилання на "
-#~ "сервер,<br>ідентифікатор елемента отримає нове значення.<br>Ви згодні?</"
-#~ "html>"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "Лишити чужий стан \"Видимий\""
-
-#~ msgid "Yes, purge it"
-#~ msgstr "Так, очистити"
-
-#~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>JOSM вилучить ваш локальний елемент з ідентифікатором {0}<br>з "
-#~ "набору даних.<br>Ви згодні?</html>"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "Залишити мій стан \"Видимий\""
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "Так, перевстановити ідентифікатор"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "Вилучити з набору даних"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "Не розв’язувати конфлікти між станами \"Видимий\""
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "Стек команд: {0}"
-
-#~ msgid "Apply also for children"
-#~ msgstr "Застосувати також для нащадків"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "Вибрати елементи, створені цим користувачем"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "Завантажити та показати історію вибраних елементів"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "Наблизитися до відповідних елементів у поточному шарі даних"
-
-#~ msgid "Filter Hidden: {0} Disabled: {0}"
-#~ msgstr "Фільтр Приховано: {0} Відключено: {0}"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr ""
-#~ "Наблизитися до елементів вмісту цього набору змін у поточному шарі даних"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr ""
-#~ "<html>Нащадка зв’язку<br>{0}<br>вилучено з сервера. Його не можливо "
-#~ "завантажити"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "Кілька членів посилаються на один і той же елемент"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>В цьому зв’язку вже є один чи декілька членів, що посилаються "
-#~ "на<br>елемент ''{0}''<br><br>Ви дійсно хочете додати ще одного члена "
-#~ "зв’язку?</html>"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr ""
-#~ "Додати всі елементи, виділені в поточному наборі даних, перед першим "
-#~ "виділеним членом"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr ""
-#~ "Додати всі елементи, виділені в поточному наборі даних, перед першим "
-#~ "членом"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr ""
-#~ "Додати всі елементи, виділені в поточному наборі даних, після останнього "
-#~ "члена"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "Виділити членів зв’язку, які відносяться до вибраних елементів"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr ""
-#~ "Виділити членів зв’язку, які відносяться до {0} елем. серед виділених "
-#~ "елементів"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "Виділити елементи для виділених членів зв’язку"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr ""
-#~ "Додати всі елементи, виділені в поточному наборі даних, після останнього "
-#~ "виділеного члена"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "Ви призначити пусту роль {0} елементу."
-#~ msgstr[1] "Ви призначити пусту роль {0} елементам."
-#~ msgstr[2] "Ви призначити пусту роль {0} елементам."
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "Це дорівнює вилученю ролі цих елементів."
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "Натисніть, щоб завантажити позначену ділянку"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>Ні <strong>{0}</strong> ні <strong>{1}</strong> не можливо.<br>Будь "
-#~ "ласка, виберіть чи завантажити дані OSM, чи дані GPX, або і перше і друге."
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">Відсутній вміст розділу довідки</p><p "
-#~ "class=\"warning-body\">Вміст довідки для розділу довідки <strong>{0}</"
-#~ "strong> ще не написано. Варіант мовою ({1}) та англомовний варіанти поки "
-#~ "відсутні.<br><br>Будь ласка, допоможіть покращити довідкову систему JOSM "
-#~ "та додайте відсутню інформацію. Ви можете виправити розділ довідки, <a "
-#~ "href=\"{2}\">вашою мовою ({1})</a> та — <a href=\"{3}\">розділ "
-#~ "англійською</a>.</p></html>"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>Шар ''{0}'' має конфлікт для елементу<br>''{1}''.<br>Будь ласка "
-#~ "розв’яжіть конфлікти, а потім спробуйте ще раз.</html>"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr ""
-#~ "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
-
-#~ msgid "Length: "
-#~ msgstr "Довжина: "
-
-#~ msgid "GPS point"
-#~ msgstr "точка GPS"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "точка"
-#~ msgstr[1] "точки"
-#~ msgstr[2] "точок"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "трек"
-#~ msgstr[1] "треки"
-#~ msgstr[2] "треків"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
-#~ "(мін. 3 символи)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "Невірний коментар для надсилання на сервер"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "Попередження: елемент ''{0}'' вже вилучено з сервера. Повторне надсилання "
-#~ "на сервер буде здійснено без цього елементу."
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "Підготовка елементів до надсилання на сервер…"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "Надсилання об’єктів. Кількість —  {0}…"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr ""
-#~ "Вилучити всіх членів, що відносяться до любого з виділених елементів"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} конфлікт був <strong>розв’язаний автоматично</strong> шляхом очищення "
-#~ "{0} об’єкту<br>з локального набору даних, так як об’єкт вже був вилучений "
-#~ "на сервері."
-#~ msgstr[1] ""
-#~ "{0} конфлікти були <strong>розв’язані автоматично</strong> шляхом "
-#~ "очищення {0} об’єктів<br>з локального набору даних, так як об’єкти вже "
-#~ "були вилучений на сервері."
-#~ msgstr[2] ""
-#~ "{0} конфліктів було <strong>розв’язано автоматично</strong> шляхом "
-#~ "очищення {0} об’єктів<br>з локального набору даних, так як об’єкти вже "
-#~ "були вилучений на сервері."
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "Лишилось розв’язати {0} конфлікт.<br><br>Будь ласка, відкрийте діалог "
-#~ "списку конфліктів і розв’яжіть конфлікт вручну."
-#~ msgstr[1] ""
-#~ "Лишилось розв’язати {0} конфлікти.<br><br>Будь ласка, відкрийте діалог "
-#~ "списку конфліктів і розв’яжіть конфлікти вручну."
-#~ msgstr[2] ""
-#~ "Лишилось розв’язати {0} конфліктів.<br><br>Будь ласка, відкрийте діалог "
-#~ "списку конфліктів і розв’яжіть конфлікти вручну."
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "трек з {0} точкою"
-#~ msgstr[1] "трек з {0} точками"
-#~ msgstr[2] "трек з {0} точками"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} точка"
-#~ msgstr[1] "{0} точки"
-#~ msgstr[2] "{0} точок"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} складається з {1} треку"
-#~ msgstr[1] "{0} складається з {1} треків"
-#~ msgstr[2] "{0} складається з {1} треків"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "Показати/приховати текст/значки"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr ""
-#~ "Попередження: не вдалося здійснити розбір стилів Mappaint з ''{0}''. "
-#~ "Помилка: {1}"
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>Попередження:</strong> Пароль переданий <strong>один раз</strong> "
-#~ "в чистому вигляді на веб-сайт OSM. <strong>Не використовуйте</strong> "
-#~ "відкритий пароль до тих пір, доки сервер OSM підтримує шифровані канали "
-#~ "зв’язку (HTTPS)."
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Створити не звукові мітки при обробці GPX даних"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr ""
-#~ "Показувати тільки корисні підказки напряму (наприклад - з теґом дороги з "
-#~ "одностороннім рухом)."
-
-#~ msgid "Used style"
-#~ msgstr "Використовується стиль"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "Використовувати типові налаштування"
-
-#~ msgid "Icon paths"
-#~ msgstr "Шлях до значків"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "Доступні стилі (з {0})"
-
-#~ msgid "Active styles"
-#~ msgstr "Активні стилі"
-
-#~ msgid "World"
-#~ msgstr "Світ"
-
-#~ msgid "Grid"
-#~ msgstr "Сітка"
-
-#~ msgid "Travel"
-#~ msgstr "Подорожі"
-
-#~ msgid "Football"
-#~ msgstr "Американський футбол"
-
-#~ msgid "Rugby"
-#~ msgstr "Регбі"
-
-#~ msgid "gray"
-#~ msgstr "сірий"
-
-#~ msgid "brown"
-#~ msgstr "коричневий"
-
-#~ msgid "black"
-#~ msgstr "чорний"
-
-#~ msgid "white"
-#~ msgstr "білий"
-
-#~ msgid "blue"
-#~ msgstr "синій"
-
-#~ msgid "red"
-#~ msgstr "червоний"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "Приєднана ділянка, що перекриває сама себе"
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr ""
-#~ "Перемістить відрізок лінії, щоб створити прямокутник. Утримуючи Ctrl, "
-#~ "перемістіть, відрізок уздовж його перпендикуляра."
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "Очищений об’єкт ''{0}''"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "Встановити значення ідентифікатора в 0"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "Спотворені висновки: "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "Невідомі висновки: "
-
-#~ msgid "Keep backup files"
-#~ msgstr "Зберігати резервні копії"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "Зіпсована заготовка теґів ''{0}''-{1}'' — кількість елементів "
-#~ "display_values повинна бути такою ж, як і у values"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "Попередження: незнайдено налаштувань ''{0}''."
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr ""
-#~ "Сервер повідомив про помилку з кодом 404, повторити з індивідуальними "
-#~ "запитами для кожного елемента."
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "Нульові координати: "
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>Не вдалося завантажити втулок {0}, тому що основний клас<br>втулка "
-#~ "''{1}'' не знайдено.<br>Вилучити його з налаштувань?"
-
-#~ msgid "No password provided."
-#~ msgstr "Немає пароля."
-
-#~ msgid "No username provided."
-#~ msgstr "Немає імені користувача."
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "Видобути будівлю, клацнувши мишею (тільки векторне зображення)"
-
-#~ msgid "Set width of building"
-#~ msgstr "Встановити ширину будівлі"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "Вкажіть протилежний кінець будівлі"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "Вкажіть кут будівлі, щоб почати креслення"
-
-#~ msgid "Grab buildings"
-#~ msgstr "Захопити будівлі"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "Ця функція вимагає (принаймні) один спеціальний шар\n"
-#~ "Будинки з кадастру та шар даних OSM."
-
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Автоматично вибрати перший шар WMS, під час здійснення захоплення, якщо "
-#~ "існує кілька шарів."
-
-#~ msgid "Create duplicate way"
-#~ msgstr "Створити дублікат лінії"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "Шар тільки для захоплення будівель"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "Дублювати виділені лінії."
-
-#~ msgid "Duplicate Way"
-#~ msgstr "Дублювати лінію"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "Неможливо дублювати невпорядковану лінію."
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>Щоб зберегти свою локальну версію даних, JOSM<br>скине "
-#~ "ідентифікатор елемента {0} на 0.<br>Під час наступного надсилання даних, "
-#~ "сервер призначить<br> їм новий ідентифікатор.<br>Ви згодні?</html>"
-
-#~ msgid "Grid origin location"
-#~ msgstr "Сітка основного місцезнаходження"
-
-#~ msgid "Grid layer:"
-#~ msgstr "Шар сітки:"
-
-#~ msgid "Grid layout"
-#~ msgstr "Розмітка сітки"
-
-#~ msgid "Add grid"
-#~ msgstr "Додати сітку"
-
-#~ msgid "Grid rotation"
-#~ msgstr "Обертання сітки"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "Індекс напрямку '{0}' не знайдений"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "Мультіполігон повинен складатися тільки з замкнутих ліній."
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "Ви повинні виділити, як мінімум, дві лінії."
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "Не вдалося створити повідомлення про нову помилку. Результат: {0}"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "Завантажити дані калібрування у файл"
-
-#~ msgid "Image not created properly."
-#~ msgstr "Зображення не створено належним чином."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Втулок відділеного керування (Remote Control) завжди прослуховує порт "
-#~ "8111 на localhost. Номер порту не можна змінити, так як він є стандартним "
-#~ "для сторонніх застосунків, що підключаються до втулка."
-
-#~ msgid "change the viewport"
-#~ msgstr "змінити область перегляду на екрані"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "підтверджувати всі дії віддаленого управління вручну."
-
-#~ msgid "load data from API"
-#~ msgstr "завантажити дані з API"
-
-#~ msgid "change the selection"
-#~ msgstr "мінити виділення"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "Налаштування втулка віддаленого керування"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "Втулок, що дозволяє іншим програмам керувати JOSM"
-
-#~ msgid "Permitted actions"
-#~ msgstr "Дозволені дії"
-
-#~ msgid "reverter: {0}"
-#~ msgstr "відновлювач: {0}"
-
-#~ msgid "image "
-#~ msgstr "зображення "
-
-#~ msgid "Tile Sources"
-#~ msgstr "Джерела квадратів мапи"
-
-#~ msgid "autozoom"
-#~ msgstr "автомасштабування"
-
-#~ msgid "autoload tiles"
-#~ msgstr "автозавантаження квадратів"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "Автомасштабування: "
-
-#~ msgid "Fade background: "
-#~ msgstr "Блякле тло: "
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr ""
-#~ "Дублювання комбінації клавіш для кнопки '{0}' — кнопка буде проігнорована!"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "Мін. рівень масштабування: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "Автозавантаження квадратів: "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "Макс. рівень масштабування: "
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "Виберіть одну замкнену лінію, яка містить, не менше чотирьох точок."
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "Попередження: втулок turnrestrictions замінює вже існуючу дію ''{0}'', "
-#~ "яка викликається комбінацією ''{1}'', діїєй ''{2}''"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr ""
-#~ "Введене посилання або ідентифікатор не підходять до вибраного сервісу.  "
-#~ "Будь ласка, спробуйте ще раз."
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "Виявлено більше ніж один елемент \"через\"."
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "Не знайдено точку чи ліню що є елементами «через»."
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "Лінія «з» не починається/закінчується у точці «через»."
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "Лінія «до» не починається/закінчується у точці «через»."
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "Лінія «з» не починається/закінчується на лінії «через»."
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "Лінія «до» не починається/закінчується на лінії «через»."
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "Вставити елементи «через» з буфера обміну"
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "Лінія <strong>З</strong> <span class=\"object-name\">{0}</span> та лінія "
-#~ "<strong>До</strong> <span class=\"object-name\">{1}</span> перетинаються "
-#~ "у точці <span class=\"object-name\">{2}</span> але <span class=\"object-"
-#~ "name\">{2}</span> не є елементом <strong>через</strong>.<br> "
-#~ "Рекомендується задати <span class=\"object-name\">{2}</span>, як "
-#~ "унікальний елемент <strong>через</strong>."
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "Вибір, переміщення і обертаня об’єктів"
-
-#~ msgid "create new objects"
-#~ msgstr "створити нові об’єкти"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "Це обмеження на поворот використовує лінію OSM <span class=\"object-name"
-#~ "\">{0}</span> з роллю <tt>з (from)</tt> <strong>та</strong> з роллю "
-#~ "<tt>до (to)</tt>. В обмеженні на поворот, лінія з роллю <tt>з (from)</tt> "
-#~ "повинна хоча б відрізнятись від лінії з роллю <tt>до (to)</tt>."
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "Додати лінію OSM з ролью «з»"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "Додати лінію OSM з ролью «до»"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "Для обмеження повороту потрібна лінія OSM з роллю <tt>до (to)</tt>."
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr ""
-#~ "Будь ласка, перейдіть до Базового редактора та вручну оберіть лінію OSM."
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr ""
-#~ "Для обмеження повороту потрібна лінія OSM з роллю <tt>з (from)</tt>."
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "Лінія OSM <span class=\"object-name\">{0}</span> з роллю <tt>{1}</tt> "
-#~ "повинна бути розділена в точці <span class=\"object-name\">{2}</span>, в "
-#~ "якій вона з’єднується з лінією <span class=\"object-name\">{3}</span>."
-
-#~ msgid "Splits the way"
-#~ msgstr "Розділити лінію"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Це обмеження на поворот використовує точку OSM <span class=\"object-name"
-#~ "\">{0}</span> в якості члена з роллю <tt>{1}</tt>."
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "Це обмеження на поворот використовує зв’язок OSM <span class=\"object-name"
-#~ "\">{0}</span> в якості члена з роллю <tt>{1}</tt>."
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "Натомість потрібна лінія OSM."
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "Перейдіть до Базового редактора та виділіть лінію OSM"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "Виправити виділені помилки."
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "Ігнорувати виділені помилки наступного разу."
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr ""
-#~ "Цей тест перевіряє на наявність ліній з однаковими теґами та координатами "
-#~ "точок."
-
-#~ msgid "Multipolygon inner way is outside."
-#~ msgstr "Внутрішня лінія мультиполігону ззовні."
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "Ця перевірка виявила багатомовні об’єкти теґ «name» у яких не дорівнює "
-#~ "деяким атрибутам «name:*» чи не є частиною набору атрибутів «name:*», "
-#~ "наприклад: Italia - Italien - Italy."
-
-#~ msgid "Non-Way in multipolygon."
-#~ msgstr "У мультиполігоні не-лінія"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "Невірна комбінація теґ/значення"
-
-#~ msgid "Painting problem"
-#~ msgstr "Проблеми малювання"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Перевірити, чи містить намальована мапа помилки в даних."
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Перевірити примітки до малюнка."
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "Нез’єднані точки та точки без теґів"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "Налаштування втулка Рухома мапа."
-
-#~ msgid "Slippy Map"
-#~ msgstr "Рухома мапа"
-
-#~ msgid "SlippyMap"
-#~ msgstr "Рухома мапа"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "Скоригуйте положення обраного шару WMS"
-
-#~ msgid "Exception occurred"
-#~ msgstr "Сталась помилка."
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr ""
-#~ "Попередження: Основне посилання ''{0}'' для сервісу WMS не закінчується "
-#~ "знаком '&' або '?'."
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "Шар WMS для коригування відсутній"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "Завантажити  квадрат WMS з {0}"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "Вибрати шар WMS"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "Будь ласка, виберіть шар WMS для коригування."
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>Основне посилання<br>''{0}''<br>для цього шару WMS не закінчується "
-#~ "ні на ''&'' чи на ''?''.<br>Це може призвести до помилкового запиту WMS. "
-#~ "Вам треба перевірити<br>ваші налаштування.<br>Ви бажаєте отримувати "
-#~ "квадрати WMS в будь-якому випадку?"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "Копіювати виділені типові налаштування"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "Налаштування втулку WMS"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "Введіть назву пункту меню та посилання WMS"
-
-#~ msgid "WMS URL"
-#~ msgstr "Посилання на WMS"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "Змінити список серверів WMS, які показуються в меню втулка WMS"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "Посилання на WMS (типове)"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "Дозволяє користувачеві створювати різні колірні схеми і перемикатися між "
-#~ "ними. Просто змініть колір і створіть нову схему. Використовується для "
-#~ "перемикання на білий фон з відповідними кольорами для більшої наочності "
-#~ "при яскравому сонячному світлі. Див. вікно налаштувань JOSM і "
-#~ "«Налаштування мапи» (дивно, але це так :-)"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "Впроваджує шар тла, якій показує сітку на мапі"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "Дублювати лінії зі зміщенням"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "Показує тло OpenLayers"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr ""
-#~ "Створити мультиполігон одним клацанням значно простіше, ніж за допомогою "
-#~ "редактора зв’язків."
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "Дозволяє іншим застосункам посилати команди JOSM."
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "Показує «рухому мапу» у JOSM. Ви можете завантажувати квадрати «рухомої "
-#~ "мапи» у якості тла та надсилати запити на її оновлення."
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "Втулок перевірки даних OSM. Він перевіряє на наявність проблем в даних та "
-#~ "пропонує вирішення для більшості загальних проблем. Перевіряє правопис "
-#~ "теґів."
-
-#~ msgid "Goods"
-#~ msgstr "Вантажівка (до 3.5т)"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "Макс. висота (у метрах)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "Макс. ширина (в метрах)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "Макс. довжина (в метрах)"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "гірський туризм"
-
-#~ msgid "demanding_alpine_hiking"
-#~ msgstr "скелелазіння"
-
-#~ msgid "difficult_alpine_hiking"
-#~ msgstr "скелелазіння з ускладненнями"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "гірське сходження"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "альпінізм"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Гідротехнічні споруди"
-
-#~ msgid "Indipend."
-#~ msgstr "Indipend."
-
-#~ msgid "Accomodation"
-#~ msgstr "Житло"
-
-#~ msgid "rugby"
-#~ msgstr "регбі"
-
-#~ msgid "football"
-#~ msgstr "американський футбол"
-
-#~ msgid "Motor Sports"
-#~ msgstr "Мотоспорт"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "Властивості Мотоспорту"
-
-#~ msgid "Edit Football"
-#~ msgstr "Властивості Американського футболу"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "Властивості Регбі"
-
-#~ msgid "Man-Made"
-#~ msgstr "Штучного походження"
-
-#~ msgid "any substance"
-#~ msgstr "іншого призначення"
-
-#~ msgid "underwater"
-#~ msgstr "підводне"
-
-#~ msgid "overground"
-#~ msgstr "надземне"
-
-#~ msgid "tower"
-#~ msgstr "опора"
-
-#~ msgid "line"
-#~ msgstr "високовольтна"
-
-#~ msgid "minor_line"
-#~ msgstr "середньої/низької напруги"
-
-#~ msgid "Amenities"
-#~ msgstr "Зручності"
-
-#~ msgid "standard"
-#~ msgstr "стандарт"
-
-#~ msgid "Terraserver Urban"
-#~ msgstr "Terraserver Urban"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Terraserver Topo"
-#~ msgstr "Terraserver Topo"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "Будь ласка, виберіть принаймні дві точки для з’єднання."
-
-#~ msgid "Download Object..."
-#~ msgstr "Завантажити об’єкт…"
-
-#~ msgid "Download Object"
-#~ msgstr "Завантажити об’єкт з сервера"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "Об’єднати виділені об’єкти в інший шар"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "Перемістить об’єкт шляхом перетягування; Натисніть Shift, щоб додати до "
-#~ "виділеного (Ctrl для вилучення); Shift-Ctrl для обертання виділеного; або "
-#~ "виділіть будь-що інше"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "Об’єднати ділянки: вилучити короткі лінії"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "Від’ємні значення вказують на Західну/Південну півкулі"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "Будь ласка, введіть ваші ім’я користувача OSM і пароль.. Пароль "
-#~ "<strong>не буде</strong> збережений у відкритому вигляді в налаштуваннях "
-#~ "JOSM та буде переданий на сервер OSM <strong>тільки один раз</strong>. "
-#~ "Всі подальші запити на надсилання на сервер даних більше не будуть "
-#~ "використовувати ваш пароль."
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "Додати ім’я файлу або URL активного стилю"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr ""
-#~ "Показує географічно прив’язані зображення як тло в JOSM (WMS сервери, "
-#~ "Yahoo, …)."
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "Вказано невірний ідентифікатор. Не можливо завантажити об’єкт."
-
-#~ msgid "With kiosk"
-#~ msgstr "З кіоском"
-
-#~ msgid "farmland"
-#~ msgstr "фермерські угіддя"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "Вирівнювання може привести до перенесення точок за межі світу.\n"
-#~ "Ваші дії будуть відмінені."
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "Ви не можете вирівняти, з’єднані відрізки.\n"
-#~ "Будь ласка, оберіть два відрізки, що не мають спільних точок."
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Ви намагаєтесь вилучити неповні об’єкти.<br>Це може призвести до проблем, "
-#~ "тому що ви не можете бачити весь об’єкт повністю.<br>Ви дійсно бажаєте "
-#~ "вилучити об’єкти?"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Ласкаво просимо</span><br>\n"
-#~ "до втулка <span style=\"font-size: xx-large;\">AlignWay<span style="
-#~ "\"color: rgb(204, 85, 0);\">S</span><br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "… чи як ще називають <br>\n"
-#~ "Втулок <span style=\"font-size: large;\">AlignWayS(egments)</span> …</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "Клацніть на кут будівля для початку креслення"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Впорядкування відрізків.</b> Натисніть <b><i><span style=\"color:"
-#~ "green\">Shift-A</span></i></b>. Також ви можете знайти команду в меню "
-#~ "<b>Інструменти</b>\n"
-#~ " або можете призначити назначить дію на <b>панель інструментів</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію"
-
-#~ msgid "{0} covers {1}% of GPS track"
-#~ msgstr "{0} накриває {1}% треку GPS"
-
-#~ msgid "backward"
-#~ msgstr "назад"
-
-#~ msgid "forward"
-#~ msgstr "вперед"
-
-#~ msgid "play/pause"
-#~ msgstr "грати/пауза"
-
-#~ msgid "Building tag:"
-#~ msgstr "Теґ будівлі:"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% трека GPS"
-
-#~ msgid "slower"
-#~ msgstr "повільніше"
-
-#~ msgid "faster"
-#~ msgstr "швидше"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "Сценарій-нащадок повернув непридатні дані."
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "Виявлені помилки. Все одно завантажити?"
-
-#~ msgid "Create house number and street name relation"
-#~ msgstr "Створити зв’язок номеру будинку з вулицею"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr ""
-#~ "Не використовувати зв’язки для адрес (крім, \"addr:street\" у елементів)"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM знайнов незбережений шар {0} з osm-даними. Вони схожі на ті, що були "
-#~ "перед останнім збоєм JOSM. Ви бажаєте відновити дані?"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "Неможливо прочитати автоматично збереженні osm-дані ({0}) - {1}"
-
-#~ msgid ""
-#~ "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to "
-#~ "grab."
-#~ msgstr "Додати «Діаграму збірки» в перелік кадастрових листів для захвату."
-
-#~ msgid "Desc"
-#~ msgstr "Опис"
-
-#~ msgid "read protocol version"
-#~ msgstr "отримувати версію протоколу"
-
-#~ msgid "SeaMap Symbol Entry"
-#~ msgstr "Сиволи елементів SeaMap"
-
-#~ msgid "Seamark Editor"
-#~ msgstr "Редактор Seamark"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr ""
-#~ "Конфлікт з атрибутом 'visible' для об’єкта типу {0} з ідентифікатором {1}"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "Об’єкт {0} з ідентифікатором {1} був позначений для вилучення, але він "
-#~ "відсутній у первісному наборі даних."
-
-#~ msgid "8/d"
-#~ msgstr "8 годин на добу"
-
-#~ msgid "Edit SeaMap Symbols"
-#~ msgstr "Правити Навігаційні Символи"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "будь ласка, введіть GPS-час"
-
-#~ msgid "Edit OpenSeaMap"
-#~ msgstr "Правити OpenSeaMap"
-
-#~ msgid "jump"
-#~ msgstr "перейти"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "Дозволити дистанційне керування (потрібен втулок remotecontrol)"
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr ""
-#~ "До Remote Control надійшов запит на завантаження WMS-шару із наступного "
-#~ "посилання:"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (дзеркало)"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "Дозволяє змінити маркування маршрутних точок треку."
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "Втулок для поєднання зображень з маршрутними точками GPX треку. Поєднання "
-#~ "буде здійснено, коли атрибут теґів 'name', 'cmt' або 'desc' маршрутної "
-#~ "точки, буде паруватись з ім’ям файлу зображення."
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr "Можливо JOSM впав останього разу. Ви бажаєте відновити ці дані?"
-
-#~ msgid "Internal style"
-#~ msgstr "Внутрішній стиль"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "Зміна властивостей 1 об’єкта"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr "Ви виділили {0} елементів. Але ви можете редагувати тільки один!"
-
-#~ msgid "import data from URL"
-#~ msgstr "імпортувати дані із посилання"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Впорядкування відрізків.</b> Натисніть <b><i><span style=\"color:"
-#~ "green\">"
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "Втулок дистанційного керування не сумісний із {0}."
-
-#~ msgid ""
-#~ "{0} will work but remote control is disabled.\n"
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "You should update the plugins. If this does not help report a bug for "
-#~ "\"{0}\"."
-#~ msgstr ""
-#~ "{0} повинен працювати але дистанційне керування відключене.\n"
-#~ "Поточна версія \"{1}\": {2}, внутрішня версія {3}. Потрібна версія {4}, "
-#~ "внутрішня версія {5}.\n"
-#~ "Ван треба оновити втулок. Якщо це не допомагає — звітуйте про помилку у "
-#~ "\"{0}\"."
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: Проблеми з дистанційним керуванням"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "Неможливо ініціалізувати дистанційне керування."
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "Безіменний шар WMS"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "Цей шар не підтримує жодної із проекцій JOSM,тому ви не можете\n"
-#~ "використовувати його. Це повідомлення не буде відображатися знову."
-
-#~ msgid "Add WMS URL"
-#~ msgstr "Додати WMS-посилання"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} повинен працювати але дистанційне керування для цього втулку "
-#~ "відключене.\n"
-#~ "Вам треба оновити втулки."
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "Поточна версія \"{1}\": {2}, внутрішня версія {3}. Потрібна версія {4}, "
-#~ "внутрішня версія {5}.\n"
-#~ "Якщо оновлення втулків не допомогло надішліть звіт про \"{0}\"."
-
-#~ msgid "Add relation"
-#~ msgstr "Додати зв’язок"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr "Рівень масштабування недостатній для запису точного зміщення"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "Запустити оглядач з вікі-довідкою для вибраного об’єкту"
-
-#~ msgid "Plugin for Seamap Editor"
-#~ msgstr "Втулок редактора Seamap"
-
-#~ msgid "Get Capabilities"
-#~ msgstr "Отримати Можливості"
-
-#~ msgid "Remote WMS"
-#~ msgstr "Віддалений WMS"
-
-#~ msgid "used"
-#~ msgstr "використання"
-
-#~ msgid "Seamap Editor"
-#~ msgstr "Редактор Seamap"
-
-#~ msgid "Seanap Editor"
-#~ msgstr "Редактор Seanap"
-
-#~ msgid "Seamarks"
-#~ msgstr "Навігаційні знаки"
-
-#~ msgid "it works realy fine"
-#~ msgstr "це дійсно гарно працює"
-
-#~ msgid "mapping seamarks"
-#~ msgstr "нанесення навігаціних знаків"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "Спрошення ділянки (вилучити {0} точку)"
-#~ msgstr[1] "Спрошення ділянки (вилучити {0} точки)"
-#~ msgstr[2] "Спрошення ділянки (вилучити {0} точок)"
-
-#~ msgid "Studio"
-#~ msgstr "Студія"
-
-#~ msgid "Zugang"
-#~ msgstr "Достпна"
-
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
-#~ msgid "Mineshaft Disused"
-#~ msgstr "Не використовується"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "Профіль висоти для треку '"
-
-#~ msgid "set {0}"
-#~ msgstr "встановити {0}"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "Будь ласка, налаштуйте вручну положення шару WMS по відомим об’єктам/"
-#~ "трекам/… перед тим як розпочати креслити"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "Поточна проекція — {0}"
-
-#~ msgid "set projection from {0} to {1}"
-#~ msgstr "змінити проекцію з {0} на {1}"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "Load file"
-#~ msgstr "Завантажити файл"
-
-#~ msgid "Could not parse file. Not a PDF file?"
-#~ msgstr "Неможливо розібрати файл. Це PDF файл?"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "Доступні стилі (з {0}):"
-
-#~ msgid "Apply all guesses"
-#~ msgstr "Застосувати усі припущення"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "Select in map"
-#~ msgstr "Виділити на мапі"
-
-#~ msgid "Guess street names"
-#~ msgstr "Вгадати назву вулиці"
-
-#~ msgid "Post Code"
-#~ msgstr "Поштовий індекс"
-
-#~ msgid "Guess address data"
-#~ msgstr "Вгадати дані адреси"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "замінено втулком {0}"
-
-#~ msgid "OSM-Cert"
-#~ msgstr "OSM-Сертифікат"
-
-#~ msgid "Key Signatures"
-#~ msgstr "Ключові підписи"
-
-#~ msgid "Key certified for OSM-Usage with comment:{0}"
-#~ msgstr "Ключ сертифікований для використання в OSM з коментарем: {0}"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "Команда GnuPG:"
-
-#~ msgid "Privacy"
-#~ msgstr "Конфіденційність"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "Більше не запитувати ключ"
-
-#~ msgid "Add comment"
-#~ msgstr "Додати коментар"
-
-#~ msgid "Close bug"
-#~ msgstr "Закрити помилку"
-
-#~ msgid "Re-open bug"
-#~ msgstr "Пере-відкрити помилку"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "Анулювати помилку"
-
-#~ msgid "Experimental union of SlippyMap plugin and WMSPlugin"
-#~ msgstr "Експериментальне об’єднання втулків SlippyMap та WMSPlugin"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr ""
-#~ "Виділіть що найменше дві точки для злиття або точку що знаходиться "
-#~ "близько до іншої точки."
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "Перенесення налаштувань WMSPlugin/SlippyMap"
-
-#~ msgid "Keep current settings"
-#~ msgstr "Зберегти поточні параметри"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "Проекцію ''{0}'' не знайдено"
-
-#~ msgid "Keep current list"
-#~ msgstr "Зберегти поточний перелік"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "{0} — невідомі налаштуваня втулка slippymap"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "{0} — невідомі налаштуваня втулка WMSPlugin"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr ""
-#~ "Перенесення налаштувань фону: конфлікт перенесення масиву {0} -> {1}"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr ""
-#~ "Перенесення налаштувань фону: конфлікт перенесення параметра {0} -> {1}"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "Замінити налаштуваннями з WMSPlugin"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "Замінити переліком з WMSPlugin"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "Перелік шарів WMS:"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "Налаштування WMSPlugin:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "Налаштування SlippyMap:"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "Перенесення налаштувань фону"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "Попередження: неочікуваний конфлікт налаштувань"
-
-#~ msgid "load imagery layers"
-#~ msgstr "завантаження шарфі фонів"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "Замінити налаштуваннями з SlippyMap"
-
-#~ msgid "Settings for the Remote Control freature."
-#~ msgstr "Налаштування функцій Віддаленого керування."
-
-#~ msgid "Add offset bookmark"
-#~ msgstr "Додати положення в закладки"
-
-#~ msgid "(save current)"
-#~ msgstr "(зберегти поточне)"
-
-#~ msgid ""
-#~ "JOSM will always listen on port 8111 on localhost.The port is not "
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
 #~ "configurable because it is referenced by external applications talking to "
 #~ "JOSM."
 #~ msgstr ""
-#~ "JOSM завжди слухатимете порт 8111 на  localhost. Цей порт не можливо "
-#~ "змінити, щоб зовнішні застосунки завжди мали змогу направити дані до JOSM."
-
-#~ msgid "Violet"
-#~ msgstr "Фіолетовий"
-
-#~ msgid "Green"
-#~ msgstr "Зелений"
-
-#~ msgid "Blue"
-#~ msgstr "Блакитний"
-
-#~ msgid "Amber"
-#~ msgstr "Бурштиновий"
-
-#~ msgid "Yellow"
-#~ msgstr "Жовтий"
-
-#~ msgid "Red"
-#~ msgstr "Червоний"
-
-#~ msgid "Orange"
-#~ msgstr "Помаранчовий"
-
-#~ msgid "No colour"
-#~ msgstr "Без кольору"
-
-#~ msgid "White"
-#~ msgstr "Білий"
-
-#~ msgid "Black"
-#~ msgstr "Чорний"
-
-#~ msgid "T3 - difficult"
-#~ msgstr "T3 - важко"
+#~ "JOSM буде завжди прослуховувати порт 8111 на  localhost. Цей порт не "
+#~ "змінюється тому, що він пов’язаний із зовнішніми застосунками, які "
+#~ "спілкуються із JOSM."
+
+#~ msgid "Download referrers for the the chosen relation and its members"
+#~ msgstr ""
+#~ "Завантажити об’єкти, що посилаються на обраний зв’язок або його членів"
+
+#~ msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+#~ msgstr "Будуть виділені суміжні ліні. З точок виділення буде знято."
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "Знайдено дані, що викликають підозру. Все одно надсилати?"
+
+#~ msgid "unkown"
+#~ msgstr "невідомо"
 
 #~ msgid ""
-#~ "Projection code mismatch in '{0}': toCode() returns ''{1}'', expected "
-#~ "''{2}''"
+#~ "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
+#~ "tune simplification"
 #~ msgstr ""
-#~ "Відсутній код проекції у '{0}': toCode() повернув ''{1}'', замість ''{2}''"
-
-#~ msgid ""
-#~ "Bad implementation of '{0}' projection class: cannot set preferences to "
-#~ "match code ''{1}''"
-#~ msgstr ""
-#~ "Погана реалізація класу проекції '{0}': не можливо встановлювати "
-#~ "параметри, які відповідають коду  ''{1}''"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "Кращій масштаб: {0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "Масштаб в пікселях: {0}"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "Показати в масштабі: {0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "Поточний масштаб: {0}"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr ""
-#~ "Потягніть відрізок лінії на потрібний відрізок іншої лінії та відпустіть"
-
-#~ msgid "Left-Click: on node to select/unselect; Drag: drag way slice"
-#~ msgstr ""
-#~ "Ліва кнопка миші: на точці для виділення/зняття виділення; Перетягування: "
-#~ "перетягування шматка лінії"
-
-#~ msgid "Contour Merge"
-#~ msgstr "Злиття контурів"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr ""
-#~ "Тягни/кидай: перетягніть відрізок лінії на потрібний відрізок іншої лінії "
-#~ "та відпустіть"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "Злиття контурів однієї ділянки з контурами іншої"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "Неможливо виділити оркему точку"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "Ліва кнопка миші: зняти виділення з точки"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "Ліва кнопка миші: виділити точку"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "Відпустіть, щоб розтащувати потрібний відрізок"
-
-#~ msgid "Run the script"
-#~ msgstr "Виконати сценарій"
-
-#~ msgid "Run"
-#~ msgstr "Виконати"
-
-#~ msgid "File:"
-#~ msgstr "Файл:"
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "Введіть ім'я файлу сценарію"
-
-#~ msgid "Merging Contour"
-#~ msgstr "Злиття контурів"
-
-#~ msgid "Run..."
-#~ msgstr "Виконати..."
-
-#~ msgid "Run a script"
-#~ msgstr "Виконати сценарій"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr "Виберіть файл сценарію і натисніть <strong>Виконати</strong>."
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "Файл сценарію ''{0}'' відсутній."
-
-#~ msgid "File not found"
-#~ msgstr "Файл не знайдено"
-
-#~ msgid "Script Error"
-#~ msgstr "Помилка сценарію"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "Не вдалося виконати сценарій."
-
-#~ msgid "Empty file name"
-#~ msgstr "Пусте ім’я файлу"
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "Не вдалося прочитати макрос з файлу ''{0}''."
-
-#~ msgid "IO error"
-#~ msgstr "Помилка Вводу/Виводу"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "Будь ласка, введіть спочатку ім’я файлу"
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "Не вдалося прочитати сценарій з файлу ''{0}''."
-
-#~ msgid "File not readable"
-#~ msgstr "Файл не читається"
-
-#~ msgid "The script file ''{0}'' isn't readable."
-#~ msgstr "Файл сценарію ''{0}'' не читається."
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "Не вдалося виконати макрос."
-
-#~ msgid "cancel"
-#~ msgstr "скасувати"
-
-#~ msgid "Launch file selection dialog"
-#~ msgstr "Запустити діалог вибору файлу"
-
-#~ msgid "No scripting engine"
-#~ msgstr "Відсутній рушій"
-
-#~ msgid "Please select a scripting engine to execute the selected script."
-#~ msgstr "Будь ласка, оберіть рушій для виконання виділеного сценарію."
-
-#~ msgid "Select a script"
-#~ msgstr "Оберіть сценарій"
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, becasue there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>Не можливо виконати сценарій, тому що не встановлено жодного рушія для "
-#~ "його виконання.</p><p>Зверніться до інтерактивної довідки за інформацією "
-#~ "про те, як встановити рушій для виконання сценаріїв в JOSM.</p>"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "Застосувати виділений рушій"
-
-#~ msgid "{1} (with engine {0})"
-#~ msgstr "{1} (рушій {0})"
-
-#~ msgid "Version:"
-#~ msgstr "Версія:"
-
-#~ msgid "..."
-#~ msgstr "…"
-
-#~ msgid "Language version:"
-#~ msgstr "Версія мови:"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "Дозволяє виконувати сценарії в JOSM."
-
-#~ msgid "MIME-Types:"
-#~ msgstr "MIME-Типи:"
-
-#~ msgid "Scripts"
-#~ msgstr "Сценарії"
-
-#~ msgid "Language:"
-#~ msgstr "Мова:"
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "Злиття контурів двох ділянок"
-
-#~ msgid "remove entry"
-#~ msgstr "вилучити запис"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "додати новий запис про wms/tms введенням посилання"
-
-#~ msgid "Internal Style"
-#~ msgstr "Внутрішній стиль"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "Файл зі сценарієм ''{0}'' не читається."
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>Виконання сценарію не можливе, відсутній встановлений рушій для "
-#~ "виконання сценаріїв.</p><p>Зверніться до інтерактивної довідки за "
-#~ "інформацією про те, як встановити рушій виконання сценаріїв в JOSM.</p>"
-
-#~ msgid "No script engine"
-#~ msgstr "Відсутній рушій виконання сценаріїв"
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr "Попередження: збій завантаження mime-типів з файлу ''0''."
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
-#~ msgstr "Попередження: збій завантаження типових mime-типів з  ''0''."
-
-#~ msgid "Scripting"
-#~ msgstr "Сценарії"
-
-#~ msgid "Configure..."
-#~ msgstr "Налаштувати…"
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "Налаштування параметрів сценаріїв"
-
-#~ msgid "Script engines"
-#~ msgstr "Рушії"
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "''{0}'' — тека. Замість цього очікувався файл jar."
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "''{0}'' не існує."
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "Налаштування роботи зі сценаріями"
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-#~ msgstr ""
-#~ "''{0}'' не читається. Не вдається завантажити сценарій з цього файлу."
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "Додати файл jar, що надае рушій виконання сценаріїв"
-
-#~ msgid "Launch file chooser"
-#~ msgstr "Запуск вікна вибору файлів"
-
-#~ msgid "JAR file"
-#~ msgstr "Файл JAR"
-
-#~ msgid "Remove the selected jar files"
-#~ msgstr "Вилучити виділені файли jar"
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM в даний час підтримує наступні рушії:"
-
-#~ msgid "Available script engines"
-#~ msgstr "Доступні рушії"
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr ""
-#~ "Файл jar ''{0}'' не містить рушія для виконання сценаріїв. Запис ''{1}'' "
-#~ "— пропущено."
-
-#~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
-#~ msgstr ""
-#~ "Не вдалося відкрити файл ''{0}'' як jar-файл. Не вдається завантажити "
-#~ "сценарій з цього файлу"
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr "Додайте додаткові файли JAR, що надають рушії виконання сценаріїв."
-
-#~ msgid "JAR files"
-#~ msgstr "Файли JAR"
-
-#~ msgid "Select a jar file"
-#~ msgstr "Виберіть файл jar"
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "Вбудований Стиль, внутрішній шлях:</b>"
-
-#~ msgid "parking_lot"
-#~ msgstr "на стоянці"
-
-#~ msgid "lane"
-#~ msgstr "на проході"
-
-#~ msgid "sidewalk"
-#~ msgstr "на тротуарі"
-
-#~ msgid "Number of {0]-ways junctions found: "
-#~ msgstr "Знайдено розв’язки {0} шляхів у кількості: "
-
-#~ msgid "Open Relation Editor"
-#~ msgstr "Відкрити редактор зв’язків"
-
-#~ msgid "Opens advanced relation/multipolygon editor panel"
-#~ msgstr "Відкрити вдосконалену панель редагування зв’язків/мультиполігонів"
-
-#~ msgid "Some actions which you were never supposed to see."
-#~ msgstr "Деякі дії, які ви ніколи не повинні бачити."
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful( don't destray valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Нижче наведено результати автоматичної перевірки. Спробуйте виправити "
-#~ "помилки, але будьте обережними (не пошкодьте вірні дані).  Якщо у вас є "
-#~ "сумніви — ігноруйте їх. <br>Якщо ви закриєте цей діалог, ви можете знайти "
-#~ "перелік помилок у бічній панелі перевірки даних."
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "Нижче результати автоматичної перевірки даних. Спробуйте виправити їх, "
-#~ "але будьте обережні (на зруйнуйте вірні дані). Якщо ви невпевнені, "
-#~ "пропустіть їх. <br>Коли ви закриєте це вікно, ви можете знайти їх у "
-#~ "бічній панелі «Перевірка даних» для подальшого виправлення."
-
-#~ msgid "Analyzing"
-#~ msgstr "Аналіз"
-
-#~ msgid "Loading from Quick History Service"
-#~ msgstr "Завантаження із Сервісу Швидкої Історії"
-
-#~ msgid ""
-#~ "Can be useful when you are improving accuracy of existing ways. The idea "
-#~ "of the plugin is to substitute dragging and dropping nodes with clicking "
-#~ "to quicken the editing process."
-#~ msgstr ""
-#~ "Може стати в нагоді під час покращення точності існуючих ліній. Ідея "
-#~ "цього втулку полягає в тому, щоб замінити перетягування точок на просте "
-#~ "клацання, в процесі редагування."
-
-#~ msgid "Makes a paralell copy of the selected way(s)"
-#~ msgstr "Створює паралельну копію виділеної лінії(й)"
-
-#~ msgid "Eps={0}"
-#~ msgstr "Eps={0}"
-
-#~ msgid "Can't parse a time from this string."
-#~ msgstr "Неможливо визначити час із цього рядка."
-
-#~ msgid ""
-#~ "The GPX file doesn't contain valid trackpoints. Please use a GPX file "
-#~ "that has trackpoints."
-#~ msgstr ""
-#~ "Файл GPX не містить вірних точок треку. Будь ласка, скористайтесь файлом "
-#~ "GPX, який містить інформацію про трек."
-
-#~ msgid "Condition isn't finished at </condition> tag"
-#~ msgstr "Умови не закінчуються теґом </condition>"
-
-#~ msgid "Couldn't find built-in ruleset {0}"
-#~ msgstr "Неможливо знайти вбудований набір правил {0}"
-
-#~ msgid ""
-#~ "Surface values must not contain any of the following characters: ',' '{' "
-#~ "'}' '=' '|"
-#~ msgstr ""
-#~ "Значення поверхні не повинно містити наступні символи: ',' '{' '}' '=' '|"
-
-#~ msgid "license validation error"
-#~ msgstr "Помилка перевірки ліцензії"
+#~ "Натисніть Enter для спрощення або збереження; Ctrl-Enter — для збереження "
+#~ "разом із теґами, Вверх/Вниз для налаштування спрошення"
+
+#~ msgid "Wxternal ruleset directory:"
+#~ msgstr "Тека із додатковими правилами:"
+
+#~ msgid "GraphView default node"
+#~ msgstr "Типова точка Графу"
+
+#~ msgid "Graphview default segment"
+#~ msgstr "Типовий відрізок Графу"
 
 #~ msgid ""
 #~ "Surface values must not contain any of the following characters: '','', "
-#~ "''{'',  ''}'', ''='', ''|''"
+#~ "'''{''',  '''}''', ''='', ''|''"
 #~ msgstr ""
 #~ "Значення параметрів поверхні не повинні містити наступні симовли: '','', "
 #~ "''{'',  ''}'', ''='', ''|''"
 
-#~ msgid "license validation other"
-#~ msgstr "Повідомлення під час перевірки ліцензії"
-
-#~ msgid "license validation warning"
-#~ msgstr "Попередження під час перевірки ліцензії"
-
-#~ msgid "Eps={0}, {1} points"
-#~ msgstr "Eps={0}, {1} пунктів"
-
 #~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
+#~ "Depending on your Operating Stystem / Distribution, you may have to "
+#~ "create a default keyring / wallet first."
 #~ msgstr ""
-#~ "Введіть координати нової точки.<br/>Ви можете відділити  довготу та "
-#~ "широту пробілом, комою чи крапкою з комою.<br/>Використовуйте додатні "
-#~ "числа чи символи N, E для позначення Північного та Східного напрямків.<br/"
-#~ ">Для Півдня та Заходу — використовуйте від’ємні числа чи символи S, W.<br/"
-#~ ">Значення координат можуть бути записані у трьох форматах:"
-#~ "<ul><li><i>градуси</i><tt>&deg;</tt></li><li><i>градуси</i><tt>&deg;</tt> "
-#~ "<i>хвилини</i><tt>&#39;</tt></li><li><i>градуси</i><tt>&deg;</tt> "
-#~ "<i>хвилини</i><tt>&#39;</tt> <i>секунди</i><tt>&quot</tt></li></"
-#~ "ul>Символи <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> є додатковими.<br/><br/>Приклади:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li><li>48&deg "
-#~ "42&#39; 52.13\" N, 21&deg 11&#39; 47.60\" E</li></ul>"
-
-#~ msgid ""
-#~ "Lengths must be given as positive decimal numbers with unit \"m\", \"km"
-#~ "\", \"mi\" or without unit.\n"
-#~ "Alternatively, the format FEET' INCHES\" can be used."
-#~ msgstr ""
-#~ "Довжину потрібно зазначати позитивним десятковим числом разом з одиницею "
-#~ "виміру \"m\", \"km\", \"mi\" чи без неї.\n"
-#~ "Допускається використання формату  ФУТИ'' ДЮЙМИ\"."
-
-#~ msgid "Erase and transfer to password manager"
-#~ msgstr "Стерти та перемістити до менеджера паролів"
-
-#~ msgid ""
-#~ "Fatal: unexpected response from HTTP server. Got {0} response without "
-#~ "'Location' header. Can''t redirect. Aborting."
-#~ msgstr ""
-#~ "Фатальна помилка: неочікувана відповідь HTTP сервера. У відповідь "
-#~ "отримано {0} без 'Location' у заголовку. Переадресування неможливе. "
-#~ "Припинення."
-
-#~ msgid "Fatal: too many redirects to the download URL detected. Aborting."
-#~ msgstr ""
-#~ "Фатальна помилка: виявлено забагато переадресувань на URL для "
-#~ "завантаження. Припинення."
-
-#~ msgid ""
-#~ "Error: failed to read from ''{0}''. Server responded with status code {1}."
-#~ msgstr ""
-#~ "Помилка: неможливо прочитати з ''{0}''. Сервер повідомив про стан кодом "
-#~ "{1}."
+#~ "В залежності від вашої операційної системи або дистрибутиву, вам треба "
+#~ "створити спочатку в’язку/гаманець для паролів."
+
+#~ msgid "Transfer to password manager and remove from prefence file"
+#~ msgstr "Перемістити у менеджер паролів та вилучити із файлу налаштувань"
+
+#~ msgid "Global settings"
+#~ msgstr "Глобальні налаштування"
Index: applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- applications/editors/josm/i18n/po/zh_CN.po	(revision 26529)
+++ applications/editors/josm/i18n/po/zh_CN.po	(revision 26530)
@@ -9,5 +9,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-20 04:21+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
@@ -18,10 +18,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:40+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:38+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -36,12 +36,12 @@
 msgstr "帮助(H)"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的文件 URL：“{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -96,6 +96,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -119,14 +120,14 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "参数“downloadgps”不能使用文件名或文件 URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "忽略不正确的 URL：“{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "Java(JRE 或</li><li>使用较旧版本的(兼容 Java 5)JOSM。</li></ul>更多信息："
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "退出 JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "强制继续"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -388,6 +389,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -414,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -420,7 +421,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -428,5 +430,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -635,5 +637,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -879,5 +881,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -886,5 +888,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1066,6 +1068,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1216,5 +1218,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1432,6 +1434,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2077,5 +2079,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2377,7 +2379,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "下载数据"
@@ -2630,6 +2632,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "忽略的例外，因为下载已被取消。例外为：{0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2752,10 +2754,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2922,5 +2924,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3506,6 +3508,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
-msgstr "发现可疑数据。强制上传吗？"
+msgid "Suspicious data found. Upload anyway?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3554,40 +3556,40 @@
 msgstr "{0} 个已修改的节点"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "从节点“{1}”删除“{0}”"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "从路径“{1}”删除“{0}”"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "从关系“{1}”删除“{0}”"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "在节点“{2}”设定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "在路径“{2}”设定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "在关系“{2}”设定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "从 {1} 对象删除“{0}”"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3706,4 +3708,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "删除动作确认"
@@ -3999,7 +4002,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr "警告：初始化首选项失败。无法将首选项重设为默认值：{0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4035,6 +4038,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr "警告：在修订版文件中有意外的 JOSM 版本号码，数值为“{0}”"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4137,9 +4140,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM 预计在数据集合中会找到原型 [{0} {1}] 但却没有。请在 http://josm."
-"openstreetmap.de 回复这个情况。这不是严重的错误，继续您的工作应是安全的。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4237,5 +4238,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4253,8 +4254,8 @@
 msgstr "多重多边形"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4394,50 +4395,64 @@
 msgstr "WGS84 地理座标"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
-msgstr "警告：无法开启资源“/data/{0}”的输入串流。不能载入 NTF<->RGF93 格线"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "兰勃特 4 区域 (法国)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} 到 {2} 度)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (科西嘉岛)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "兰勃特 CC 区"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "兰勃特 CC9 区 (法国)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "兰勃特区 (爱沙尼亚)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "麦卡托投影"
@@ -4462,81 +4477,101 @@
 msgstr "实施“{0}”投影法类别错误：不能将首选项匹配代码“{1}”。"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (波兰)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG 区"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (波兰)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 区 {0} (波兰)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (瑞士)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (拉脱维亚 TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM 区"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "球面投影"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "东移 3.000.000m"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "留尼旺 RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "圭亚那 RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM 法国 (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM 大地测量系统"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4755,45 +4790,45 @@
 msgstr "这个测试会检查多重多边形是否有效"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "区域类型的路径未封闭"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "多重多边形没有外部路径"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "多重多边形中没有样式"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "在多重多边形关系中没有样式"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "内部路径的样式等同多重多边形"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "外部路径的样式不符"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "多重多边形未封闭"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "多重多边形的内部路径超出外围"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "多重多边形之间有交集"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "多重多边形成员没有有用的角色"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "多重多边形内没有路径"
@@ -5064,5 +5099,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5087,5 +5122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5096,5 +5131,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5502,5 +5537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5566,5 +5601,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "公路"
@@ -5572,5 +5607,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5578,10 +5613,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "航道"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "土地利用"
@@ -5591,5 +5626,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5602,5 +5637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5612,5 +5647,5 @@
 msgstr "公共交通"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5967,5 +6002,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6074,4 +6109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6175,5 +6211,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6217,10 +6253,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>或者您可以以格式 <i>缩放等级/x/y</i> 为一个简单的拼贴输入一个<strong>拼"
-"贴地址</strong>,例如 <i>15/256/223</i>。以格式 <i>缩放等级,x,y</i> 或 <i>缩放"
-"等级;x;y</i> 输入拼贴地址也可以。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6503,7 +6536,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr "合并元件的列表。它们会在合并决定被接受时取代我的元件。"
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6727,10 +6760,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "保留我的坐标"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "保留他们的坐标"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6786,6 +6819,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6807,6 +6840,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7201,5 +7234,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7439,5 +7472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7659,7 +7692,37 @@
 msgstr "mapcss"
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr "未知"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "不明"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7938,5 +8001,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7956,5 +8019,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7971,5 +8034,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "下载已选定关系的不完整成员"
@@ -7977,5 +8040,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "下载不完整的成员"
@@ -8018,5 +8081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -8024,5 +8087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8214,5 +8277,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8314,5 +8377,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "用户"
@@ -9305,5 +9367,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9485,5 +9547,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9627,4 +9689,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "只是我自己拥有的修改集合"
@@ -9637,4 +9700,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "只是由下列用户名拥有的修改集合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -9912,9 +9981,9 @@
 msgstr "这个修改集合查询 URL 是无效的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "添加属性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9922,13 +9991,13 @@
 msgstr[0] "这会改变 {0} 个对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "空白的数值代表删除该标签。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9941,18 +10010,19 @@
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "是否改变数值？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr "覆盖设定键"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr "替换"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9963,5 +10033,5 @@
 "新的设定键已在使用，覆盖数值吗？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9970,5 +10040,5 @@
 msgstr[0] "改变属性至 {0} 个对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9976,27 +10046,31 @@
 msgstr[0] "这会改变 {0} 个对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "请选择一个设定键"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "请选择一个数值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "请选择您要改变属性的对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "属性/成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "选定对象的属性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10005,62 +10079,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "属性：{0}/成员：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "属性/成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "改变关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "自关系中删除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "确定要删除关系 {0} 的选择范围？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "删除所有对象中选定的设定键"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "删除属性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "将新的设定键/数值配对添加到所有的对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "编辑所有对象选定设定键的数值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "转到 OSM 的维基页面查看标签的帮助内容 (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "启动浏览器并显示选定对象的维基说明"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "选择主要选择范围的关系。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr "选择选定关系的成员"
@@ -10123,9 +10197,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "警告：忽略例外，因为工作已取消。例外：{0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10145,6 +10221,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "正在下载 {1} 父关系的 {0} 个不完整子项"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10483,9 +10560,4 @@
 msgstr "输入时有 {0} 个冲突。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "警告：因为工作已取消，忽略例外。例外为：{0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10526,10 +10598,4 @@
 msgid "Load relation"
 msgstr "载入关系"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "警告：忽略例外，因为工作已取消。例外：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10808,37 +10874,4 @@
 msgstr "类型"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "不明"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10966,20 +10999,20 @@
 msgstr "坐标"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "节点 {0} 的历史记录"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "路径 {0} 的历史记录"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "关系 {0} 的历史记录"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "重新载入服务器的历史记录"
@@ -11071,6 +11104,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "修改集合"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11625,11 +11658,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>上传和/或保存的选项，用于 {0} 个修改过的图层<br>被取消或有错误时。</"
-"html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12045,4 +12077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12073,13 +12106,4 @@
 "<html>不能以一次要求上传 {0} 个对象，因为超过了服务器“{2}”<br>的最大修改集合"
 "大小 {1}。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>需要<strong>多个修改集合</strong>才能上传 {0} 个对象。您想要使用哪种方"
-"式？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12151,38 +12175,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "自定义颜色"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "默认"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "选择一种颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "名称：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "描述：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12192,9 +12216,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12202,26 +12226,26 @@
 msgstr "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "时间跨度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "长度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "长度：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12229,8 +12253,8 @@
 msgstr[0] "{0} 条路线， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12238,12 +12262,12 @@
 msgstr[0] "{0} 个路点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps 点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12251,10 +12275,10 @@
 msgstr[0] "{0} 条轨迹， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "转换为数据图层"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12264,78 +12288,78 @@
 "请看这里：</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "转换自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "从 OSM 沿这条轨迹下载"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "下载这里面的每个对象："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} 米"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "每个要求最大区域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "下载接近："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "只有轨迹"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "只有路点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "轨迹与路点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12345,11 +12369,11 @@
 "<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否希望<br>继续？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在图层中没有可用的 GPX 轨迹可供音频关联。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12357,6 +12381,6 @@
 msgstr "部分时间戳记早于轨迹起点或晚于终点的路点会被忽略或是转到起点。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12364,27 +12388,27 @@
 msgstr "部分离轨迹太远而无法明显判断其时间的路点会被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "已命名点的标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名轨迹点"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "输入音频"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12396,29 +12420,29 @@
 "我们不能将它们与声音数据关联。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "不可能输入"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音频文件 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音频标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "输入图片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12525,5 +12549,5 @@
 msgstr "发现下列问题："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12536,57 +12560,65 @@
 "请更改投影法，或者删除图层。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "自动缩放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "自动加载拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "载入拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "显示拼贴信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "载入所有拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "增加缩放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "减少缩放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "贴紧拼贴大小"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "清除拼贴缓存"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "放大以加载拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "放大以加载更多拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "缩小以查看更多信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "在此缩放等级没有拼贴"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr "支持 EPSG:4326 和麦卡托投影法"
@@ -13123,15 +13155,15 @@
 msgstr "JPEG 图片 (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps 标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13139,26 +13171,26 @@
 msgstr[0] "{0} 由 {1} 个标记组成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "这个图层中没有既存的音频标记可偏移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "显示文字/图标"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "切换标记文字和图标的可见性状态。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "同步音频"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "您在聆听同步队列时，需要暂停音频。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13166,14 +13198,14 @@
 msgstr "音频同步于点 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "在播放时无法于图层同步。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "在播放开头放置声音标记"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13198,13 +13230,13 @@
 msgstr "无法建立新的音频标记。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "尝试显示这个标记的 URL 时发生错误"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL 为： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "在显示 URL 时发生错误"
@@ -14190,82 +14222,82 @@
 msgstr "颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "绘制方向箭头"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "只在路径的开头。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "绘出单行道箭头。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "绘制区段顺序编号"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "绘出已下载数据的边界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "在选择模式中，绘出虚拟节点"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "将未使用的图层以其他颜色绘制"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑地图图片(反锯齿)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "只绘出区域的轮廓"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS 点"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "绘出路径区段的方向提示。"
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr "绘出单行道和其他有方向的对象的方向箭头。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "绘出所有区段在其路径中的顺序编号。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地图查看应用平滑化，以产生较平滑的外观。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "绘出从服务器下载数据的边界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "为了容易修改路径，在选择模式中绘出虚拟节点。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "将未使用的数据图层以不同的颜色绘制。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14273,15 +14305,51 @@
 msgstr "这个选项会防止填满区域，并且会覆盖在选定样式中指定的任何数值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM 数据"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "自动"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "名称"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "无"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "使用全域设定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14292,47 +14360,39 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "本地文件"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "无"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "如果没有输入区段时，强制绘出线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "绘出大型 GPS 点。"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "从 HDOP 数值中绘制圆形。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度(红 = 慢，绿 = 快)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr "方向(红 = 北，黄 = 西，绿 = 东，蓝 = 南)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的稀疏度(红 = 高，绿 = 低，如果可用的话)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "单一颜色(可以为已命名的图层自定义)"
@@ -14340,5 +14400,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14362,5 +14422,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14403,5 +14463,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14415,38 +14475,18 @@
 msgstr "步行"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "读取 GPX 时建立标记。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "快速绘制(看起来较丑)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr "基于数据限制的动态色彩范围"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "自动"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "名称"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "描述"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "都要"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14455,10 +14495,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 点之间绘出线条"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14466,35 +14506,35 @@
 msgstr "绘出本地文件线条的最大长度(米)。设为“-1”则绘出所有的线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "本地文件最大长度(米)"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "绘出线条的最大长度(米)。设为“-1”则绘出所有的线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "最大长度(米)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果输入的数据不含线条信息，仍强制绘出线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "绘出线条的方向箭头，连接 GPS 点。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查询的方式绘制方向箭头，而非复杂的数学运算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14502,14 +14542,14 @@
 msgstr "如果没有离最后一个至少为这个距离，就不要绘出箭头。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "最小距离(像素)"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "将 GPS 点以较大的点绘制。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14517,13 +14557,13 @@
 msgstr "所有的点和轨迹区段都使用同样的颜色。可以在图层管理程序中自定义。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "依速度来为点和轨迹区段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr "依方向为点和轨迹区段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14531,27 +14571,45 @@
 msgstr "为地点精度 (HDOP) 的点和轨迹区段上色。您的捕获设备需要能记录这项信息。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允许依不同的平均速度调整轨迹颜色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "轨迹与点的颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "路点标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15226,10 +15284,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSM 会一直监听本地端口 8111。这个端口是不能设置的，因为它被与 JOSM 沟通的外"
-"部程序所参考。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15318,5 +15374,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "重新设定"
@@ -15605,6 +15661,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "永远不询问就更新"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16003,5 +16059,5 @@
 msgstr "新建关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16030,9 +16086,9 @@
 msgstr "搜索预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "只显示可适用的选项"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "搜索关键字"
@@ -16313,7 +16369,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr "解析 gpx 文件 {0} 时发生错误。文件将只有部分可以使用"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16635,6 +16691,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr "OsmChange 文件的序言尚未写入。请先进行写入。"
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -16848,9 +16904,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"元素“bounds”缺少必要的属性。得到 minlon=\"{0}\",minlat=\"{1}\",maxlon="
-"\"{3}\",maxlat=\"{4}\", origin=\"{5}\"。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17241,4 +17295,9 @@
 msgstr "保存用户与密码(未加密)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18087,4 +18146,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18208,4 +18269,18 @@
 msgstr "无法载入 XML 架构。"
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18780,6 +18855,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "允许过滤掉不需要的 GPS 轨迹"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
@@ -35103,4 +35178,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35117,6 +35193,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35135,15 +35211,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "缩写的街道名称"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "节点上有单行道标签"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "节点上有桥梁标签"
@@ -35154,12 +35230,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "节点上有错误的公路标签"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "未命名的未分类道路"
@@ -35168,16 +35244,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "没有编号的公路"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "临时公路标签"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "拼错的键名"
@@ -35187,10 +35263,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr "带有标签 bicycle 的自行车道"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr "带有标签 foot 的步道"
@@ -35199,10 +35275,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "用于路径的障碍物"
@@ -35211,35 +35287,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr "用于步道的限速标签"
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "有 + 号的图层标签"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "街道名称包含 ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "没有类型的关系"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "没有名称的餐馆"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "不常见的标签组合"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35344,117 +35429,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "捷克 CUZK：KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "捷克 UHUL：ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "英国地形测量局新大众版 (NPE) 地图"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr ""
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr ""
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr ""
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr ""
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35699,6 +35794,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "上传已取消"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35800,9 +35895,9 @@
 msgstr "(没有高度数据)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr "无法保存首选项"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr "快速绘制配置"
@@ -35820,23 +35915,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr "快速绘制设置"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr "保存设置"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr "无法读取设置"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr "按回车以简化或保存，Ctrl-回车以带标签保存，向上/向下以调整简化程度"
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35846,26 +35971,54 @@
 "化或保存，Ctrl-Shift-单击以开始新线条"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr "快速绘制"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr "快速绘制模式"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr "请移动鼠标以绘制新路径"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "插件信息"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr "不能在世界之外放置节点。"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr "用鼠标绘制路径"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35873,6 +36026,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "修正地址"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -35982,9 +36135,9 @@
 msgstr "显示不完整的地址"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "项目"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "没有项目"
@@ -36083,17 +36236,34 @@
 msgstr "选择有不完整数据的所有地址。"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "图层属性"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "导入图像"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "导入地理参照图像"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "创建图层时发生错误： "
@@ -36789,31 +36959,35 @@
 msgstr "选择社区"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "地籍管理"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "自动来源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"插件 cadastre-fr 一般使用功能键 F11 为快捷键\n"
-"但它目前是默认分配给全屏切换使用\n"
-"您是否想要恢复以 F11 作为抓取动作？"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "恢复抓取快捷键 F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM 已停止，以让修改生效。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36935,7 +37109,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr "将原始的白色背景以在 JOSM 首选项中定义的背景颜色取代。"
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37842,5 +38016,5 @@
 msgstr "添加 EGPX 图层"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37850,17 +38024,17 @@
 "上传轨迹，请看这里："
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "自定义线条的绘制"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "在这个图层的各点之间绘出线条。"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "在这个图层的各点之间不要绘出线条。"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "选择线条绘制选项"
@@ -38012,5 +38186,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -38018,10 +38192,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -38030,5 +38204,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -38039,6 +38213,6 @@
 "{0}"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -38047,9 +38221,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr "没有找到文件：\n"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38208,71 +38382,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr "选择目录"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr "车辆"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "创建"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr "恢复默认设置"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr "可视化"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr "节点颜色"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr "箭头颜色"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr "新书签"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr "真的要删除“{0}”吗？"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr "删除的书签"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38280,32 +38462,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr "复位的书签"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr "选择节点的颜色"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr "选择箭头的颜色"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38340,6 +38516,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38470,30 +38646,43 @@
 msgstr "输入中..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39186,5 +39375,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39201,5 +39390,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39932,17 +40121,17 @@
 msgstr "来自剪贴板的新图片图层"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "支持的图像文件"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "来自文件的新图片图层..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "找不到地图对象。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer 无法载入或导入图片。"
@@ -39956,41 +40145,33 @@
 msgstr "剪贴板数据不是图片"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "找到关联到图片文件的校正文件："
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(将首选项中的“{0}”设置为 是/否/询问\n"
-"以控制校准文件的自动载入)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "您想要应用它吗？"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "是否载入校准文件？"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "它将会自动应用。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr "同时，从现在起，校准文件都会自动载入。"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"将首选项中的“{0}”设置为 是/否/询问，\n"
-"以控制校准文件的自动载入。"
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -40611,6 +40792,6 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
-msgstr "下载选定关系及它的成员的参照"
+msgid "Download referrers for the chosen relation and its members."
+msgstr ""
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
@@ -41590,4 +41771,21 @@
 msgstr "创建新的签署密钥"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41811,7 +42009,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
-msgstr[0] "这个转弯限制参照到 {0} 已在这个转弯限制编辑器之外被删除："
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -42060,6 +42259,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "为选定的转弯限制开启编辑器"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -42659,6 +42858,6 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
-msgstr "会选择相邻的路径。将会取消选择节点。"
+msgid "Adjacent ways will be selected. Nodes will be deselected."
+msgstr ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java:23
@@ -43048,1537 +43247,121 @@
 msgstr "在这个图层驾驶赛车"
 
-#~ msgid "Do not show again"
-#~ msgstr "以后不要再显示"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "空指针异常，可能是丢失的标签"
-
-#~ msgid "Unknown version"
-#~ msgstr "未知版本"
-
-#~ msgid "Preparing data..."
-#~ msgstr "准备数据..."
-
-#~ msgid "Error during parse."
-#~ msgstr "解析数据时出错。"
-
-#~ msgid "Aborting..."
-#~ msgstr "正在中止..."
-
-#~ msgid "Enter Password"
-#~ msgstr "请输入密码"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "有未保存的修改，放弃修改继续？"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "未保存的修改"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "请对错误的产生提供尽可能详细的步骤！"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "请确认提供以下信息："
-
-#~ msgid "Save and Exit"
-#~ msgstr "保存并退出"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Open in Browser"
-#~ msgstr "在浏览器中打开"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "加载页面 {0} 时出错"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "只允许两个节点"
-
-#~ msgid "Only one node selected"
-#~ msgstr "只选中了一个节点"
-
-#~ msgid "Faster Forward"
-#~ msgstr "快进"
-
-#~ msgid "Errors during Download"
-#~ msgstr "下载时的错误"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "解决冲突"
-
-#~ msgid "Download Object..."
-#~ msgstr "下载对象..."
-
-#~ msgid "Download Object"
-#~ msgstr "下载对象"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "指定了无效的 ID。不能下载对象。"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "下载参照到已选取原型中之一的原型"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "切换全屏视图"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "全屏视图"
-
-#~ msgid "Fix relations"
-#~ msgstr "修正关系"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "已连结自我重叠的区域"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "为所有冲突的项目输入值。"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "连结区域:移除短路径"
-
-#~ msgid "Closed Way"
-#~ msgstr "封闭的路径"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "请至少选取两个节点来合并"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "将目前选取的原型合并到另一个图层"
-
 #~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
+#~ msgstr "忽略的例外，因为下载已被取消。例外为：{0}"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "保留我的坐标"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "保留他们的坐标"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "警告：忽略例外，因为工作已取消。例外：{0}"
+
+#~ msgid ""
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "警告：因为工作已取消，忽略例外。例外为：{0}"
+
+#~ msgid ""
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
+#~ msgstr "警告：忽略例外，因为工作已取消。例外：{0}"
+
+#~ msgid ""
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>上传和/或保存的选项，用于 {0} 个修改过的图层<br>被取消或有错误时。</"
+#~ "html>"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "永远不询问就更新"
+
+#~ msgid ""
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
+#~ msgstr "解析 gpx 文件 {0} 时发生错误。文件将只有部分可以使用"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr "OsmChange 文件的序言尚未写入。请先进行写入。"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "上传已取消"
+
+#~ msgid "Fix adresses"
+#~ msgstr "修正地址"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "不常见的标签组合"
+
+#~ msgid "Both"
+#~ msgstr "都要"
+
+#~ msgid "Changeset"
+#~ msgstr "修改集合"
+
+#~ msgid ""
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
+#~ "configurable because it is referenced by external applications talking to "
+#~ "JOSM."
 #~ msgstr ""
-#~ "复制的资料含有不完整的原型。当粘贴的时候不完整的原型会被移除。您确定要粘贴"
-#~ "含有不完整原型的数据吗？"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "到 {0} 个原型"
+#~ "JOSM 会一直监听本地端口 8111。这个端口是不能设置的，因为它被与 JOSM 沟通的"
+#~ "外部程序所参考。"
 
 #~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr "拖曳一个路径来制作矩形。按 Ctrl 后拖曳并以平常的方式移动一个区段。"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "选择、移动和旋转对象"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "请输入过滤条件字串。"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "请输入查找字串。"
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
+#~ msgstr "将原始的白色背景以在 JOSM 首选项中定义的背景颜色取代。"
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
+#~ msgstr "同时，从现在起，校准文件都会自动载入。"
 
 #~ msgid ""
-#~ "<html>{0} relations build a cycle because they refer to each other."
-#~ "<br>JOSM cannot upload them. Please edit the relations and remove the "
-#~ "cyclic dependency."
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
 #~ msgstr ""
-#~ "<html>{0} 关系形成一个循环，因为它们互相参照对方。<br>JOSM 不能上传它们。"
-#~ "请编辑这个关系并删除掉这个循环相依性。"
+#~ "<html>或者您可以以格式 <i>缩放等级/x/y</i> 为一个简单的拼贴输入一个"
+#~ "<strong>拼贴地址</strong>,例如 <i>15/256/223</i>。以格式 <i>缩放等级,x,y</"
+#~ "i> 或 <i>缩放等级;x;y</i> 输入拼贴地址也可以。</html>"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "允许过滤掉不需要的 GPS 轨迹"
+
+#~ msgid "Supicious data found. Upload anyway?"
+#~ msgstr "发现可疑数据。强制上传吗？"
+
+#~ msgid "Change values?"
+#~ msgstr "是否改变数值？"
 
 #~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
 #~ msgstr ""
-#~ "您即将删除不完整的对象。<br>这样会造成问题，因为您没有看到实际的对象。<br>"
-#~ "您确定要删除吗?"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "从关系 {0} 删除参考"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "取消删除 {0} 个原型"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "度-分-秒格式"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "缺少 id {0} 对象的合并目标"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>无法写入书签。<br>{0}</html>"
-
-#~ msgid "The current value isn''ta valid tile address"
-#~ msgstr "目前的数值不是有效的拼贴位址"
-
-#~ msgid "The current value isn''ta valid tile index for the given zoom level"
-#~ msgstr "目前的数值在指定的缩放等级中是无法使用的拼贴索引"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "合并删除的原型失败"
-
-#~ msgid "<html>Enter a tag key, ie <strong><tt>fixme</tt></strong></html>"
-#~ msgstr "<html>输入标签键值，例如<strong><tt>fixme</tt></strong></html>"
-
-#~ msgid "<html>Enter a tag value, ie <strong><tt>check members</tt></strong>v"
-#~ msgstr ""
-#~ "<html>输入标签数值，例如<strong><tt>check members</tt></strong></html>"
+#~ "<html>需要<strong>多个修改集合</strong>才能上传 {0} 个对象。您想要使用哪种"
+#~ "方式？</html>"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "找到关联到图片文件的校正文件："
+
+#~ msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+#~ msgstr "会选择相邻的路径。将会取消选择节点。"
 
 #~ msgid ""
-#~ "<html>You did not finish to merge the differences in this conflict."
-#~ "<br>Conflict resolutions will not be applied unless all "
-#~ "differences<br>are resolved.<br>Click <strong>{0}</strong> to close "
-#~ "anyway.<strong> Already<br>resolved differences will not be applied.</"
-#~ "strong><br>Click <strong>{1}</strong> to return to resolving conflicts."
-#~ msgstr ""
-#~ "<html>您尚未完成这个冲突中差异的合并。<br>冲突的调解只有在所有差异都<br>解"
-#~ "决后才会应用。<br>请按 <strong>{0}</strong> 强制关闭路径。<strong>已经<br>"
-#~ "解决的差异都不会应用。</strong><br>点击 <strong>{1}</strong> 则返回冲突调"
-#~ "解。"
-
-#~ msgid "</p><p>Close the filter dialog to see all objects.<p>"
-#~ msgstr "</p><p>关闭过滤条件对话框以查看所有的对象。<p>"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "输入新节点的座标"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "使用十进位度数"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "负数表示西半球/南半球"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "请输入有效的纬度范围 -90..90"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "请输入纬度范围 -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "请输入有效的经度范围 -180..180"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "请输入经度范围 -180..180"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "缩放到目前数据图层对应的原型"
-
-#~ msgid ""
-#~ "<html>There is at least one member in this relation referring<br>to the "
-#~ "relation itself.<br>This creates circular dependencies and is discouraged."
-#~ "<br>How do you want to proceed with circular dependencies?"
-#~ msgstr ""
-#~ "<html>在这个关系中至少有一个成员参照到<br>这个关系自身。<br>这样会建立循环"
-#~ "相依关系，但是不建议这么做。<br>您要如何处理循环相依关系?</ html>"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "多个成员参照到同一原型"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "删除所有参照到选取原型其中之一的成员"
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "选取参照到目前选取范围的关系成员"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "选择已选取关系成员的原型"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "这样等同删除这些原型的角色。"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "点击以下载目前选取的区域"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because the server has a newer "
-#~ "version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>"
-#~ "{0}</strong> to synchronize the entire local dataset with the server."
-#~ "<br>Click <strong>{1}</strong> to abort and continue editing.<br>"
-#~ msgstr ""
-#~ "<html>上传<strong>失败</strong>，因为服务器已有您的节点、路径或关系<br>的"
-#~ "新版本。<br><br>请按<strong>{0}</ strong>将整个本地数据组与服务器同步。"
-#~ "<br>按<strong>{1}</strong>则会放弃并继续编辑。<br>"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "正在准备要上传的原型 ..."
-
-#~ msgid "Length: "
-#~ msgstr "长度： "
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "轨迹"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "点"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "有 {0} 个点的轨迹"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} 由 {1} 轨迹组成"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} 点"
-
-#~ msgid "Keep backup files"
-#~ msgstr "保留备份文件"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr "服务器传回代码 404，以每个原型个别要求的方式重试。"
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "格式不良的段落： "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "不明的段落： "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "零坐标： "
-
-#~ msgid "No password provided."
-#~ msgstr "没有提供密码。"
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "您不能对齐相互连接的区段。\n"
-#~ "请选取两个没有共用任何节点的区段。"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "对齐会造成节点掉出世界之外。\n"
-#~ "您的动作被还原了。"
-
-#~ msgid "Grab buildings"
-#~ msgstr "抓取建筑"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "这个功能需要(至少)一个特殊的 cadastre\n"
-#~ "建筑图层和 OSM 数据图层。"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "只抓取建筑物图层"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "重制路径"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "重制选取的路径。"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "不能重制未排序的路径。"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "建立重复的路径"
-
-#~ msgid "Grid origin location"
-#~ msgstr "格线原始位置"
-
-#~ msgid "Grid rotation"
-#~ msgstr "格线旋转"
-
-#~ msgid "World"
-#~ msgstr "世界"
-
-#~ msgid "Grid layout"
-#~ msgstr "格线配置"
-
-#~ msgid "Grid layer:"
-#~ msgstr "格线图层："
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "多重多边形必须由封闭的路径组成。"
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "您必须选择至少两条路径。"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "无法建立新的错误报告。结果：{0}"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "将校准数据载入到文件"
-
-#~ msgid "Image not created properly."
-#~ msgstr "图片无法正确的建立。"
-
-#~ msgid "load data from API"
-#~ msgstr "从 API 载入数据"
-
-#~ msgid "create new objects"
-#~ msgstr "建立新的对象"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "手动确认所有的远程控制动作"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "允许 JOSM 被其他应用程序控制的插件。"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "远程控制插件的设定值。"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "远程控制插件会一直听取本机的 8111 端口。此端口是无法改变的，因为它参照了外"
-#~ "部应用程序与此插件的沟通。"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "id {1} 类型 {0} 的目标有无效的版本"
-
-#~ msgid "Slippy Map"
-#~ msgstr "快速地图"
-
-#~ msgid "image "
-#~ msgstr "图片 "
-
-#~ msgid "autozoom"
-#~ msgstr "自动缩放"
-
-#~ msgid "autoload tiles"
-#~ msgstr "自动载入拼贴"
-
-#~ msgid "SlippyMap"
-#~ msgstr "快速地图"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "快速地图插件的设定值。"
-
-#~ msgid "Tile Sources"
-#~ msgstr "拼贴来源"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "最小缩放等级： "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "最大缩放等级： "
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "选择至少有四个节点的单一、封闭的路径。"
-
-#~ msgid "Cannot find object with id \"{0}\" in layer \"{1}\""
-#~ msgstr "在图层 \"{1}\" 中找不到 id \"{0}\" 的对象"
-
-#~ msgid "Create a new turn restriction in layer \"{0}\""
-#~ msgstr "在图层 \"{0}\" 中建立新的转弯限制"
-
-#~ msgid "Edit a new turn restriction in layer \"{0}\""
-#~ msgstr "在图层 \"{0}\" 中编辑新的转弯限制"
-
-#~ msgid "Edit turn restriction \"{0}\" in layer \"{1}\""
-#~ msgstr "在图层 \"{1}\" 中编辑转弯限制 \"{0}\""
-
-#~ msgid ""
-#~ "<html>Layer \"{0}\" already has a conflict for object<br>\"{1}\"."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>图层 \"{0}\" 已经有冲突于对象<br> \"{1}\"。<br>请先调解这个冲突，然"
-#~ "后再试一次。</html>"
-
-#~ msgid "multiple objects with role \"{0}\""
-#~ msgstr "角色为 \"{0}\" 的多个对象"
-
-#~ msgid "Warning: failed to load icon for turn restriction type \"{0}\""
-#~ msgstr "警告：无法载入转弯限制类型 \"{0}\" 的图示"
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "请转到基本编辑器并手动选择一条 OSM 道路。"
-
-#~ msgid "Splits the way"
-#~ msgstr "切割这个路径"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "这个转弯限制使用 OSM 节点 <span class=\"object-name\">{0}</span> 作为角色 "
-#~ "<tt>{1}</tt> 的成员。"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "这个转弯限制使用 OSM 关系 <span class=\"object-name\">{0}</span> 作为角色 "
-#~ "<tt>{1}</tt> 的成员。"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "需要 OSM 路径代替。"
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "改变为基本编辑器并选择 OSM 路径"
-
-#~ msgid "Grid"
-#~ msgstr "格线"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "数据有错误。要强制上传吗?"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "修正选取的错误。"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "下次忽略选取的错误。"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr "这个测试会检查有无同样标签及节点坐标的路径。"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "不合法的标签/数值组合"
-
-#~ msgid "Key \"{0}\" invalid."
-#~ msgstr "设定键 \"{0}\" 无效。"
-
-#~ msgid "Key \"{0}\" not in presets."
-#~ msgstr "设定键 \"{0}\" 不在预设组合里。"
-
-#~ msgid "Value \"{0}\" for key \"{1}\" not in presets."
-#~ msgstr "设定键 \"{1}\" 的数值 \"{0}\" 不在预设组合中。"
-
-#~ msgid "Illegal expression \"{0}\""
-#~ msgstr "不合法的辞句 \"{0}\""
-
-#~ msgid "Illegal regular expression \"{0}\""
-#~ msgstr "不合法的正则表示式 \"{0}\""
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "未加标签与未连接的节点"
-
-#~ msgid "<html>There are no ways connected to node \"{0}\". Aborting.</html>"
-#~ msgstr "<html>没有路径连接到节点 \"{0}\"。正在中止。</html>"
-
-#~ msgid ""
-#~ "Way downloader data inconsistency. Prior connected way \"{0}\" wasn''t "
-#~ "discovered after download"
-#~ msgstr "路径下载器数据不一致。先前连接的路径 \"{0}\" 在下载后并未发现"
-
-#~ msgid ""
-#~ "<html>There aren''t further connected ways to download.<br>A potential "
-#~ "duplicate node of the currently selected node was found, though."
-#~ "<br><br>The currently selected node is \"{0}\"<br>The potential duplicate "
-#~ "node is \"{1}\"<br>Merge the duplicate node onto the currently selected "
-#~ "node and continue way downloading?</html>"
-#~ msgstr ""
-#~ "<html>没有其他连接的路径要下载了。<br>然而，发现了目前选取节点可能的复本节"
-#~ "点。<br><br>目前选取的节点是 \"{0}\" <br>可能的复本节点是 \"{1}\" <br>是否"
-#~ "将复本节点合并到目前选取的节点并继续路径下载?</html>"
-
-#~ msgid "Node \"{0}\" is a junction with more than 2 connected ways."
-#~ msgstr "节点 \"{0}\" 是 2 条以上连接路径的汇集点。"
-
-#~ msgid "Exception occurred"
-#~ msgstr "发生例外"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "调整选取的 WMS 图层的位置"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "请选择要调整的 WMS 图层。"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "选择 WMS 图层"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "目前没有 WMS 图层要调整。"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "从 {0} 下载 WMS 拼贴"
-
-#~ msgid "Warning: The complete URL is \"{0}\"."
-#~ msgstr "警告：完整的 URL 是 \"{0}\"。"
-
-#~ msgid ""
-#~ "The projection \"{0}\" in URL and current projection \"{1}\" mismatch.\n"
-#~ "This may lead to wrong coordinates."
-#~ msgstr ""
-#~ "URL 中的投影 \"{0}\" 与目前的投影 \"{1}\" 不符。\n"
-#~ "这可能会导致错误的坐标。"
-
-#~ msgid "Warning: WMS layer deactivated because of malformed base url \"{0}\""
-#~ msgstr "警告：不使用 WMS 图层，因为基础 url \"{0}\" 格式错误"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "修改在 WMS 插件菜单中显示的 WMS 服务器清单"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "输入菜单名称和 WMS URL"
-
-#~ msgid "farmland"
-#~ msgstr "农田"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "提供显示地图格线的背景图层"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr "点一下就可以建立多重多边形，比标准使用关系编辑器的方式更加容易。"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "显示 OpenLayers 背景图片"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "让其他的应用程序传送指令给 JOSM。"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "在 JOSM 中显示快速地图格线。可以从快速地图中载入拼贴作为背景并要求更新。"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "OSM 数据验证器。它会检查数据中的问题，并提供对一般问题的修正。同时整合了对"
-#~ "标签名称的拼写检查。"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr "显示地理参照图片作为 JOSM 的背景(WMS 服务器、Yahoo...)。"
-
-#~ msgid "Goods"
-#~ msgstr "货物"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "登山"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "费力的登山"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "高山登山"
-
-#~ msgid "Waterway Point"
-#~ msgstr "水路点"
-
-#~ msgid "Travel"
-#~ msgstr "旅游"
-
-#~ msgid "Accomodation"
-#~ msgstr "住宿"
-
-#~ msgid "Motor Sports"
-#~ msgstr "摩托车运动"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "编辑摩托车运动"
-
-#~ msgid "Amenities"
-#~ msgstr "便利设施"
-
-#~ msgid "black"
-#~ msgstr "黑色"
-
-#~ msgid "brown"
-#~ msgstr "浅褐色"
-
-#~ msgid "red"
-#~ msgstr "红色"
-
-#~ msgid "blue"
-#~ msgstr "蓝色"
-
-#~ msgid "gray"
-#~ msgstr "灰色"
-
-#~ msgid "white"
-#~ msgstr "白色"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Man-Made"
-#~ msgstr "人造"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "无法读取 OSM 自动保存的数据 ({0}) - {1}"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr "基于安全性的理由无法从 \"{0}\" 载入书签。例外为：{1}"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>图层 \"{0}\" 已经有冲突于原型<br>\"{1}\"。<br>请先调解这个冲突，然后"
-#~ "再试一次。</html>\""
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr ""
-#~ "警告：原型 \"{0}\" 已在服务器上删除了。正跳过这个原型并尝试重新上传。"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr "警告：从 \"{0}\" 解析 Mappaint 样式失败。例外为：{1}"
-
-#~ msgid "Building tag:"
-#~ msgstr "建筑物标签:"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "警告：turnrestrictions 插件将快捷键 \"{1}\" 原本的动作 \"{0}\" 替换成动作 "
-#~ "\"{2}\""
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "选择由这个用户提交的原型"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">缺少帮助主题的内容</p><p class="
-#~ "\"warning-body\">帮助主题的内容 <strong>{0}</strong> 尚不能取得。不管是您"
-#~ "当地语言 ({1}) 或是英语版本都没有。<br><br>请帮助改进 JOSM 帮助系统并填好"
-#~ "缺少的信息。您可以编辑<a href=\"{2}\">将帮助主题编辑为当地的语言 ({1})</"
-#~ "a> 和 <a href=\"{3}\">英语版本</a>。</p></html>"
-
-#~ msgid "Used style"
-#~ msgstr "用户样式"
-
-#~ msgid "No username provided."
-#~ msgstr "没有提供用户名称。"
-
-#~ msgid "change the viewport"
-#~ msgstr "改变查看端口"
-
-#~ msgid "standard"
-#~ msgstr "标准"
-
-#~ msgid "Desc"
-#~ msgstr "描述"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "允许改变轨迹的标签。"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "一条带有角色<tt>到达</tt>的 OSM 路径需要在一个转弯限制中。"
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr "一条带有角色<tt>出发</tt>的 OSM 路径需要在一个转弯限制中。"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "用于 OSM 路径的这个转弯限制 <span class=\"object-name\">{0}</span> 带有角"
-#~ "色<tt>出发</tt><strong>和</strong>角色<tt>到达</tt>。然而，在一个转弯限制"
-#~ "中，带有角色<tt>出发</tt>的路径不应与带有角色<tt>到达</tt>的路径相同。"
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "带有角色 <tt>{1}</tt> 的 OSM 路径 <span class=\"object-name\">{0}</span> "
-#~ "应被在连接路径 <span class=\"object-name\">{3}</span> 的节点 <span class="
-#~ "\"object-name\">{2}</span> 处切割。"
-
-#~ msgid "play/pause"
-#~ msgstr "播放/暂停"
-
-#~ msgid "faster"
-#~ msgstr "加速"
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "<strong>出发</strong>路径 <span class=\"object-name\">{0}</span> 和"
-#~ "<strong>到达</strong>路径 <span class=\"object-name\">{1}</span> 于节点 "
-#~ "<span class=\"object-name\">{2}</span> 交叉，但 <span class=\"object-name"
-#~ "\">{2}</span> 不是一个<strong>经过</strong>对象。<br>建议将 <span class="
-#~ "\"object-name\">{2}</span> 设置为唯一的<strong>经过</strong>对象。"
-
-#~ msgid "forward"
-#~ msgstr "前进"
-
-#~ msgid "backward"
-#~ msgstr "后退"
-
-#~ msgid "slower"
-#~ msgstr "减速"
-
-#~ msgid "underwater"
-#~ msgstr "水下"
-
-#~ msgid "any substance"
-#~ msgstr "任何物质"
-
-#~ msgid "tower"
-#~ msgstr "塔"
-
-#~ msgid "overground"
-#~ msgstr "地上"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "目前只能连接两个区域。"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "下载并显示选取原型的历史记录"
-
-#~ msgid "With kiosk"
-#~ msgstr "有售货亭"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "无法初始化远程控制。"
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "远程控制插件与 {0} 不兼容。"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "添加 WMS URL"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "未命名的 WMS 图层"
-
-#~ msgid "import data from URL"
-#~ msgstr "从 URL 导入数据"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr "当前缩放级别不足以准确地记录偏移量"
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr "远程控制已要求从以下 URL 加载 WMS 图层:"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "子脚本返回了无效的数据。"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "来自轨迹的高度轮廓"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "改变 1 个对象的属性"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "允许远程控制(需要 remotecontrol 插件)"
-
-#~ msgid "Remote WMS"
-#~ msgstr "远程 WMS"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% GPS 轨迹"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "可用样式(自 {0}):"
-
-#~ msgid "Internal style"
-#~ msgstr "内部样式"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "read protocol version"
-#~ msgstr "读取通讯协议版本"
-
-#~ msgid "Permitted actions"
-#~ msgstr "允许的动作"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "简化区域(移除 {0} 个节点)"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "自动缩放: "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "自动载入拼贴: "
-
-#~ msgid "Fade background: "
-#~ msgstr "淡化背景: "
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "那个图层不支持任何 JOSM 的投影法，\n"
-#~ "因此您不能使用它。这个信息不会再显示。"
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "当前版本 \"{1}\": {2}，内部版本 {3}。需要版本 {4}，内部版本 {5}。\n"
-#~ "如果升级插件没有改善，请报告程序错误到 \"{0}\"。"
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}: 远程控制有问题"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "只提示重要的方向(例如单行道标签)。"
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "被 {0} 插件替换"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr "缩放到目前数据图层这个修改集合的内容的原型"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "WMSPlugin/SlippyMap 设定值转换"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr "图片设定值转移: 当移动属性 {0} -> {1} 时发生冲突"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr "图片设定值转移: 当移动阵列 {0} -> {1} 时发生冲突"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "有 {0} 个未知的 WMSPlugin 设定值"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "有 {0} 个未知的 slippymap 插件设定值"
-
-#~ msgid "Keep current list"
-#~ msgstr "保留目前的清单"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "覆盖 WMSPlugin 清单"
-
-#~ msgid "Keep current settings"
-#~ msgstr "保留目前的设定值"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "覆盖 WMSPlugin 设定值"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "覆盖 SlippyMap 设定值"
-
-#~ msgid "WMS layer list:"
-#~ msgstr "WMS 图层清单:"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "WMSPlugin 设定值:"
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "SlippyMap 设定值:"
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "图像设定值转移"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "警告：找不到首选项 \"{0}\"。"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory \"{0}\" "
-#~ "is not a directory."
-#~ msgstr "警告：初始化首选项失败。首选项目录 \"{0}\" 不是一个目录。"
-
-#~ msgid ""
-#~ "<html>None of the objects in the content of changeset {0} is available in "
-#~ "the current<br>edit layer \"{1}\".</html>"
-#~ msgstr ""
-#~ "<html>在目前编辑图层 \"{1}\" 修改集合{0} 的内容<br>中没有对象可用。</html>"
-
-#~ msgid ""
-#~ "Note that changeset queries are currently always submitted to \"{0}\", "
-#~ "regardless of the host, port and path of the URL entered below."
-#~ msgstr ""
-#~ "请注意修改集合查询目前永远送出到 \"{0}\" ，不管下列输入的URL 路径、主机和"
-#~ "端口。"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you have been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset."
-#~ msgstr ""
-#~ "<html>上传<strong>失败</strong>，因为您使用的<br>修改集合{0} 已经在{1}被关"
-#~ "闭了。<br>请以新的或已开启的修改集合再上传一次。"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "请输入这个上传修改集合的注解 (最少 3 个字节)"
-
-#~ msgid ""
-#~ "Objects are uploaded to the <strong>open changeset</strong> {0} with "
-#~ "upload comment \"{1}\"."
-#~ msgstr "对象会上传到<strong>开放修改集合</strong> {0}，上传注解为 \"{1}\"。"
-
-#~ msgid ""
-#~ "The server reported that the current changeset was closed.<br>This is "
-#~ "most likely because the changesets size exceeded the max. size<br>of {0} "
-#~ "objects on the server \"{1}\"."
-#~ msgstr ""
-#~ "服务器回复目前的修改集合已关闭。<br>这很可能是由于修改集合的大小超过<br>服"
-#~ "务器 \"{1}\" 最大 {0} 个对象的大小。"
-
-#~ msgid ""
-#~ "<html>Failed to retrieve a list of changesets from the OSM API server "
-#~ "at<br>\"{1}\". The server responded with the return code {0} instead of "
-#~ "200.<br>Please check the spelling of \"{1}\" and validate again.</html>"
-#~ msgstr ""
-#~ "<html>无法从这个 OSM API 服务器取回修改集合的清单：<br> \"{1}\"。服务器传"
-#~ "回代码为 {0} 而非 200。<br>请检查 \"{1}\" 的拼写后再验证一次。</html>"
-
-#~ msgid ""
-#~ "Warning: Unsupported value in preference \"{0}\", got {1}''. Using "
-#~ "authentication method ''Basic Authentication''."
-#~ msgstr ""
-#~ "警告：在首选项 \"{0}\" 中有不支持的数值，发现 \"{1}\"。使用的验证方式为"
-#~ "\"基础验证\"。"
-
-#~ msgid ""
-#~ "Warning: unsupported start element \"{0}\" in changeset content at "
-#~ "position ({1},{2}). Skipping."
-#~ msgstr ""
-#~ "警告：在修改集合内容的位置 ({1},{2}) 有不支持的起始元素 \"{0}\"。正在跳"
-#~ "过。"
-
-#~ msgid ""
-#~ "Warning: unsupported end element \"{0}\" in changeset content at position "
-#~ "({1},{2}). Skipping."
-#~ msgstr ""
-#~ "警告：在修改集合内容的位置 ({1},{2}) 有不支持的结尾元素 \"{0}\"。正在跳"
-#~ "过。"
-
-#~ msgid ""
-#~ "<html>Authentication at the OSM server with the username \"{0}\" failed."
-#~ "<br>Please check the username and the password in the JOSM preferences.</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>以用户名 \"{0}\" 验证 OSM 服务器失败。<br>请检查在 JOSM 首选项中的使"
-#~ "用者名称和密码。</html>"
-
-#~ msgid ""
-#~ "Preference with key \"{0}\" does not provide an int value for \"{1}\". "
-#~ "Got {2}. Cannot restore window geometry from preferences."
-#~ msgstr ""
-#~ "首选项的设定键 \"{0}\" 没有提供 \"{1}\" 的整数值。得到 \"{2}\"。不能从首选"
-#~ "项中回复视窗位置大小。"
-
-#~ msgid ""
-#~ "Failed to parse field \"{1}\" in preference with key \"{0}\". Exception "
-#~ "was: {2}. Cannot restore window geometry from preferences."
-#~ msgstr ""
-#~ "无法解析首选项的设定键 \"{0}\" 的栏位 \"{1}\"。例外为: \"{2}\"。不能从首选"
-#~ "项中回复视窗位置大小。"
-
-#~ msgid ""
-#~ "Preference with key \"{0}\" does not exist. Cannot restore window "
-#~ "geometry from preferences."
-#~ msgstr "首选项的设定键 \"{0}\" 不存在。不能从首选项中回复视窗位置大小。"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>对齐区段。</b> 请按 <b><i><span style=\"color:green\">Shift-A</"
-#~ "span></i></b>。另外您可以在<b>工具</b>菜单找到这个指令\n"
-#~ "，也可以把这个动作放置到<b>工具栏</b>上。\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "<html>The base URL<br>\"{0}\"<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>这个 WMS 图层的基础 URL<br> \"{0}\" <br>的结尾不能是 \"&\" 或 \"?"
-#~ "\" 。<br>这可能会导致无效的 WMS 要求。您应该检查您的<br>首选项值。<br>是否"
-#~ "要强制取回 WMS 拼贴?"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS 插件首选项"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "重制路径并偏移"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr "请至少选择要合并的两个节点或临近另一个节点的节点。"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "找不到投影方法 \"{0}\""
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "在开始绘图之前请先使用已知对象/轨迹/... 调整 WMS 图层"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "目前的投影方法设为 {0}"
-
-#~ msgid "set {0}"
-#~ msgstr "设置 {0}"
-
-#~ msgid "Close bug"
-#~ msgstr "关闭错误"
-
-#~ msgid "Add comment"
-#~ msgstr "添加注解"
-
-#~ msgid "OSM-Cert"
-#~ msgstr "OSM-凭证"
-
-#~ msgid "Privacy"
-#~ msgstr "隐私设定"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "不能选择一个孤立的节点"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr "选择一个脚本文件，然后点击<strong>运行</strong>。"
-
-#~ msgid "Run..."
-#~ msgstr "运行..."
-
-#~ msgid "Run a script"
-#~ msgstr "运行一个脚本"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "请先输入一个文件名。"
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "脚本文件 \"{0}\" 不存在。"
-
-#~ msgid "Run the script"
-#~ msgstr "运行脚本"
-
-#~ msgid "Run"
-#~ msgstr "运行"
-
-#~ msgid "File not readable"
-#~ msgstr "文件不可读"
-
-#~ msgid "The script file ''{0}'' isn't readable."
-#~ msgstr "脚本文件 \"{0}\" 无法读取。"
-
-#~ msgid "Empty file name"
-#~ msgstr "空文件名"
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "输入脚本名"
-
-#~ msgid "File not found"
-#~ msgstr "文件未找到"
-
-#~ msgid "Script Error"
-#~ msgstr "脚本错误"
-
-#~ msgid "IO error"
-#~ msgstr "IO 错误"
-
-#~ msgid "Launch file selection dialog"
-#~ msgstr "启动文件选择对话框"
-
-#~ msgid "No scripting engine"
-#~ msgstr "没有脚本引擎"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "脚本执行失败。"
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "宏执行失败。"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "cancel"
-#~ msgstr "取消"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "接受选定的脚本引擎"
-
-#~ msgid "Please select a scripting engine to execute the selected script."
-#~ msgstr "请选择一个脚本引擎来执行选定的脚本。"
-
-#~ msgid "Select a script"
-#~ msgstr "选择一个脚本"
-
-#~ msgid "Scripts"
-#~ msgstr "脚本"
-
-#~ msgid "{1} (with engine {0})"
-#~ msgstr "{1} (与引擎 {0})"
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "内置样式，内部路径:</b>"
-
-#~ msgid "remove entry"
-#~ msgstr "删除项目"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "输入网址以添加新的 wms/tms 项目"
-
-#~ msgid "Internal Style"
-#~ msgstr "内部样式"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>不论 <strong>{0}</strong> 或 <strong>{1}</strong> 都没有启用。<br>请"
-#~ "选择下载 OSM 数据，或 GPX 数据，或两个都选。</html>"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>这个 WMS 图层的基础 URL <br>\"{0}\"<br> 的结尾不能是 \"&\" 或 \"?"
-#~ "\" 。<br>这可能会导致无效的 WMS 要求。您应该检查您的<br>首选项值。<br>是否"
-#~ "要强制取回 WMS 拼贴?\""
-
-#~ msgid "Contour Merge"
-#~ msgstr "轮廓合并"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "将区域的轮廓与另一个区域的轮廓合并"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr "拖/放：拖曳路径区段并将它放到目标区段上"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "拖放以对齐目标区段"
-
-#~ msgid "Merging Contour"
-#~ msgstr "合并轮廓"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "脚本文件 \"{0}\" 不可读取"
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "从文件 \"{0}\" 中读取脚本失败。"
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "从文件 \"{0}\" 中读取宏失败。"
-
-#~ msgid "No script engine"
-#~ msgstr "没有脚本引擎"
-
-#~ msgid "Scripting"
-#~ msgstr "脚本"
-
-#~ msgid "Configure..."
-#~ msgstr "设定..."
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "设定脚本首选项"
-
-#~ msgid "Script engines"
-#~ msgstr "脚本引擎"
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "设定脚本引擎和脚本"
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "\"{0}\" 不存在。"
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-#~ msgstr "\"{0}\" 不可读。不能从这个文件载入脚本引擎。"
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr "jar 文件 \"{0}\" 不能提供脚本引擎。缺少项目 \"{1}\"。"
-
-#~ msgid "JAR files"
-#~ msgstr "JAR 文件"
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr "输入提供脚本引擎的额外 JAR 文件。"
-
-#~ msgid "Available script engines"
-#~ msgstr "可用的脚本引擎"
-
-#~ msgid "JAR file"
-#~ msgstr "JAR 文件"
-
-#~ msgid "Remove the selected jar files"
-#~ msgstr "移除选取的 jar 文件"
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "添加提供脚本引擎的 jar 文件"
-
-#~ msgid "Select a jar file"
-#~ msgstr "选择一个 jar 文件"
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "合并两个区域的轮廓"
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "允许在 JOSM 中执行脚本。"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "最高高度 (米)"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "最大宽度 (米)"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "最长长度 (米)"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "清除的对象 \"{0}\""
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr "类型 {0} id {1} 的对象已被标记为删除，但它在数据集中丢失了。"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "当前缩放：{0}"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "显示缩放：{0}"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "单像素大小：{0}"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "最佳缩放：{0}"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "左击：取消选取节点"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "左击：选择节点"
-
-#~ msgid "Left-Click: on node to select/unselect; Drag: drag way slice"
-#~ msgstr "左击：选择/取消选择节点; 拖动：拖动路径片段"
-
-#~ msgid "File:"
-#~ msgstr "文件："
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>脚本不能执行，因为目前没有安装脚本引擎。</p><p>请参考在线帮助，以了解如"
-#~ "何在 JOSM 安装脚本引擎的信息。</p>"
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr "警告：无法从文件 \"{0}\" 中载入 MIME 类型。"
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
-#~ msgstr "警告：无法从来源 \"{0}\" 中载入默认 MIME 类型。"
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM 目前支持下列脚本引擎："
-
-#~ msgid "Version:"
-#~ msgstr "版本："
-
-#~ msgid "Language:"
-#~ msgstr "语言："
-
-#~ msgid "Language version:"
-#~ msgstr "语言版本："
-
-#~ msgid "MIME-Types:"
-#~ msgstr "MIME-类型："
-
-#~ msgid ""
-#~ "The following are results of automatic validation. Try fixing these, but "
-#~ "be careful (don't destroy valid data). When in doubt ignore them.<br>When "
-#~ "you cancel this dialog, you can find the entries in the validator side "
-#~ "panel to inspect them."
-#~ msgstr ""
-#~ "以下是自动验证的结果。尝试修复它们，但要小心(不要破坏有效的数据)。有疑问"
-#~ "时，请忽略。<br>当您取消此对话框，您可以在 validator 侧板找到结果并检查它"
-#~ "们。"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr "警告：将清除路径 {0}，因为其节点数已低于 2。目前为 {1}"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr "看来 JOSM 上次似乎是崩溃了。您想恢复数据吗？"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "请输入您的 OSM 用户名和密码。密码将<strong>不会</strong>以明文的方式保存"
-#~ "在 JOSM 首选项，同时它也只会传送到 OSM 服务器<strong>一次</strong>。往后的"
-#~ "数据上传要求不会再使用您的密码。"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr "您已经选择了 {0} 个元素。但是您只能编辑一个元素！"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:'sans-serif'; font-weight:bold; font-style:"
-#~ "italic;\">\n"
-#~ "<span style=\"font-size:large;\">欢迎使用</span><br>\n"
-#~ "<span style=\"font-size:xx-large;\">AlignWay<span style=\"color:rgb(204, "
-#~ "85, 0);\">S</span> 插件<br>\n"
-#~ "</span><span style=\"font-size:medium;\"><br>\n"
-#~ "...或者它应该被称为 <br>\n"
-#~ "<span style=\"font-size:large;\">AlignWayS(egments)</span> 插件...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green\">"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>对齐区段。</b> 按<b><i><span style=\"color:green\">"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr "拖曳路径区段，并将它放到目标区段上"
-
-#~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
-#~ msgstr "无法将文件 \"{0}\" 作为 jar 文件打开。不能从这个文件载入脚本引擎"
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "不要再询问这个密钥"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "从剪贴板插入“经过”对象"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "允许用户建立不同的颜色配置，并在它们之间切换。只要改变颜色并建立新的配置即"
-#~ "可。可用来切换为白色背景，以便在明亮的阳光下有较佳的视觉感受。请查阅 JOSM "
-#~ "首选项中的对话框与“地图设定值”(有点怪但确是真的 ：-)"
-
-#~ msgid "Can't parse a time from this string."
-#~ msgstr "无法从这个字符串中解析时间。"
-
-#~ msgid ""
-#~ "The GPX file doesn't contain valid trackpoints. Please use a GPX file "
-#~ "that has trackpoints."
-#~ msgstr "GPX 文件中不包含有效的轨迹点。请使用具有轨迹点的 GPX 文件。"
-
-#~ msgid "Use <b>\"</b> to quote operators (eg if key contains <b>:</b>)"
-#~ msgstr "使用 <b>\"</b> 将运算子包起来(例如当键值包含 <b>:</b>)"
-
-#~ msgid ""
-#~ "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-#~ "escaped by a preceding <b>\\</b> (eg <b>\\\"</b> and <b>\\\\</b>)."
-#~ msgstr ""
-#~ "有引号的字串 <b>\"</b> 和 <b>\\</b> 字节需要在前头加上 <b>\\</b> (例如 <b>"
-#~ "\\\" </b> 和 <b>\\\\</b>)。"
-
-#~ msgid ""
-#~ "Warning: automatically truncating value of tag \"{0}\" on deleted object "
-#~ "{1}"
-#~ msgstr "警告：自动截短在已删除对象 {1} 上标签 \"{0}\" 的数值"
-
-#~ msgid ""
-#~ "Length of value for tag \"{0}\" on object {1} exceeds the max. allowed "
-#~ "length {2}. Values length is {3}."
-#~ msgstr ""
-#~ "在对象 {1} 上的标签 \"{0}\" 数值的长度超过最大值。允许的长度为 {2}。数值的"
-#~ "长度为 {3}。"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr "警告：图层 \"{0}\" 已不存在。无法删除原型 \"{1}\" 的冲突。"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "错误：服务器的书签清单中有意外的行 \"{0}\""
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr "错误：服务器的书签清单的 \"{1}\" 行有不合格的 double 数值 \"{0}\""
-
-#~ msgid ""
-#~ "Warning: unexpected JOSM version number in revison file, value is \"{0}\""
-#~ msgstr "警告：在修订版文件中有意外的 JOSM 版本号码，数值为 \"{0}\""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
+#~ msgstr "警告：初始化首选项失败。无法将首选项重设为默认值：{0}"
+
+#~ msgid "unkown"
+#~ msgstr "未知"
 
 #~ msgid ""
 #~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-#~ "Please report this at http://josm.openstreetmap.de . This is not a "
+#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
 #~ msgstr ""
@@ -44587,741 +43370,20 @@
 
 #~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "下列原型无法复制到目标原型，<br>因为它们已经在目标数据集合中被删除了："
-
-#~ msgid "List of elements in my dataset, ie the local dataset"
-#~ msgstr "我的数据集合里元件的清单，例如本地数据集合"
-
-#~ msgid "List of elements in their dataset, ie the server dataset"
-#~ msgstr "他们的数据集合里元件的清单，例如服务器数据集合"
-
-#~ msgid "Properties in my dataset, ie the local dataset"
-#~ msgstr "我的数据集合的属性，例如本地数据集合"
-
-#~ msgid "Properties in their dataset, ie the server dataset"
-#~ msgstr "他们的数据集合的属性，例如服务器数据集合"
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+#~ msgstr "警告：在修订版文件中有意外的 JOSM 版本号码，数值为“{0}”"
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr "将目前数据集合中选取的所有原型加到第一个成员之前"
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
+#~ msgstr "警告：无法开启资源“/data/{0}”的输入串流。不能载入 NTF<->RGF93 格线"
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr "将目前数据集合中选取的所有原型加到最后一个成员之后"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
+#~ msgstr "合并元件的列表。它们会在合并决定被接受时取代我的元件。"
 
 #~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr "将目前数据集合中选取的所有原型加到第一个选取的成员之前"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr "将目前数据集合中选取的所有原型加到最后一个选取的成员之后"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because the server has a newer "
-#~ "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-#~ "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-#~ "server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-#~ "strong> to synchronize the conflicting primitive only.<br>Click <strong>"
-#~ "{5}</strong> to synchronize the entire local dataset with the server."
-#~ "<br>Click <strong>{6}</strong> to abort and continue editing.<br>"
-#~ msgstr ""
-#~ "<html>上传<strong>失败</strong>，因为服务器上的节点、<br>路径或关系比您的"
-#~ "版本更新。<br>这个冲突是由于 <strong>{0}</strong> ( id <strong>{1}</"
-#~ "strong>) 造成，<br>服务器的版本为{2}，您的版本为 {3}。<br><br>请点击"
-#~ "<strong>{4}</strong> 只同步有冲突的原型。<br>点击<strong>{5}</strong> 会与"
-#~ "服务器同步整个本地数据集合。<br>点击<strong>{6}</strong> 则会放弃并继续编"
-#~ "辑。<br>"
-
-#~ msgid ""
-#~ "Warning: Unexpected parameters for HTTP proxy. Got host \"{0}\" and port "
-#~ "\"{1}\"."
-#~ msgstr "警告：意外的 HTTP 代理服务器参数。得到主机 \"{0}\" 和端口 \"{1}\"。"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "启动浏览器并显示选定对象的维基帮助页"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "警告: 意外的设定值冲突"
-
-#~ msgid "Launch file chooser"
-#~ msgstr "启动文件选取器"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr "无法将整个连结或 id 与选定的服务进行比对。请再试一次。"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr "类型 {0} id 为 {1} 的对象在 ”visible“ 属性中有冲突"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "这个测试会检查多语系对象的“name”属性不会等同于某些“name:*”属性，并且也不是"
-#~ "由“name:*”属性组成。例如：Italia - Italien - Italy。"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr "警告：WMS 服务基础 URL“{0}”没有以 '&' 或 '？' 结尾。"
-
-#~ msgid "parking_lot"
-#~ msgstr "停车场"
-
-#~ msgid "sidewalk"
-#~ msgstr "人行道"
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr "不要为地址使用关系(但为元素使用“addr：street”)"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "找不到方向索引“{0}”"
-
-#~ msgid "Loading from Quick History Service"
-#~ msgstr "正在从快速历史服务中载入"
-
-#~ msgid "Analyzing"
-#~ msgstr "正在分析"
-
-#~ msgid "license validation error"
-#~ msgstr "许可证验证器错误"
-
-#~ msgid "license validation warning"
-#~ msgstr "许可证验证器警告"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "按钮“{0}”有重复的热键 - 按钮会被忽略！"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr "在提交错误报告之前，请尝试将 JOSM 升级到最新版本。"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr "无法连接到 OSM 服务器，请检查您的 Internet 连接。"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "解析失败：错误的 GPX 文档结构"
-
-#~ msgid "Missing required attribute \"{0}\"."
-#~ msgstr "必要的属性“{0}”没有找到"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "id=0 的非法对象"
-
-#~ msgid "File could not be found."
-#~ msgstr "找不到文件。"
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA 导入失败！"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "没有打开的文档, 无需保存。"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "未知文件扩展名。"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "从备份文件中恢复时出现了一个错误。"
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "保存时出现了一个错误。"
-
-#~ msgid "Could not back up file."
-#~ msgstr "无法备份文件。"
-
-#~ msgid "No data imported."
-#~ msgstr "没有数据导入。"
-
-#~ msgid "Click <strong>{0}</strong> to ignore."
-#~ msgstr "点击 <strong>{0}</strong> 跳过。"
-
-#~ msgid ""
-#~ "<b>timestamp:</b>... - objects with this timestamp "
-#~ "(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-#~ msgstr ""
-#~ "<b>timestamp:</b>... - 有此时间戳记的对象(<b>2009-11-12T14:51:09Z</b>，"
-#~ "<b>2009-11-12</b > 或 <b>T14:51</b> ...)"
-
-#~ msgid ""
-#~ "<html>Could not read bookmarks from<br>\"{0}\"<br>Error was: {1}</html>"
-#~ msgstr "<html>无法读取书签<br>“{0}”<br>错误为：{1}</html>"
-
-#~ msgid ""
-#~ "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-#~ "relation</strong>."
-#~ msgstr ""
-#~ "<html>请确认是否从 <strong>1 个关系</strong>中删除 <strong>1 个对象</"
-#~ "strong>。"
-
-#~ msgid ""
-#~ "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0}"
-#~ "relations</strong>."
-#~ msgstr ""
-#~ "<html>请确认是否从 <strong>{0} 个关系</strong>中删除 <strong>1 个对象</"
-#~ "strong>。"
-
-#~ msgid ""
-#~ "<html>Please confirm to remove <strong>{0} objects</strong> from <strong>"
-#~ "{1}relations</strong>."
-#~ msgstr ""
-#~ "<html>请确认是否从 <strong>{1} 个关系</strong>中删除 <strong>{0} 个对象</"
-#~ "strong>。"
-
-#~ msgid ""
-#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
-#~ "single tile in the format <i>zoomlevel/x/y</i>, ie <i>15/256/223</i>. "
-#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
-#~ "too."
-#~ msgstr ""
-#~ "<html>或者您也可以输入<strong>拼贴地址</strong>指定单一拼贴，格式为"
-#~ "<i>zoomlevel/x/y</i>，例如 <i>15/256/223</i>。拼贴位址的格式如<i>zoom,x,"
-#~ "y</i> 或<i>zoom;x;y</i> 也是可以使用的。"
-
-#~ msgid ""
-#~ "<html>The current value is not a valid user name.<br>Please enter an non-"
-#~ "empty user name.</html>"
-#~ msgstr "<html>目前的数值不是有效的用户名。<br>请输入非空白的用户名。</html>"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr "选取参照到目前选取范围 {0} 原型的关系成员"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "您正在设定 {0} 个原型的空白角色。"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both."
-#~ msgstr ""
-#~ "<html>不论 <strong>{0}</strong> 或 <strong>{1}</strong> 都没有启用。<br>请"
-#~ "选择下载 OSM 数据，或 GPX 数据，或两个都选。"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">缺少帮助主题的内容</p><p class="
-#~ "\"warning-body\">帮助主题的内容 <strong>{0}</strong> 尚不能取得。不管是您"
-#~ "当地语言({1})或是英语版本都没有。<br><br>请协助改进 JOSM 帮助系统并填好缺"
-#~ "少的信息。您可以编辑<a href=\"{2}\">将帮助主题编辑为当地的语言({1})</a>和"
-#~ "<a href=\"{3}\">英语版本</a>。</p>"
-
-#~ msgid ""
-#~ "<html><p class=\"error-header\">Error when retrieving help information</"
-#~ "p><p class=\"error-body\">The content for the help topic <strong>{0}</"
-#~ "strong> could not be loaded. The error message is (untranslated):<br><tt>"
-#~ "{1}</tt></p>"
-#~ msgstr ""
-#~ "<html><p class=\"error-header\">在取得帮助信息时发生错误</p><p class="
-#~ "\"error-body\">无法载入帮助主题 <strong>{0}</strong> 的内容。错误信息为(未"
-#~ "翻译)：<br><tt>{1}</tt></p>"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you tried to delete node "
-#~ "{0}which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
-#~ "download all parent ways of node {0}.<br>If necessary JOSM will create "
-#~ "conflicts which you can resolve in the Conflict Resolution Dialog."
-#~ msgstr ""
-#~ "<html>上传<strong>已失败</strong>，因为您尝试删除的节点 {0} 仍被路径 {1} "
-#~ "使用中。<br><br>请点击 <strong>{2}</strong> 以下载节点 {0} 的所有上层路"
-#~ "径。<br>如果有需要 JOSM 会建立冲突项目让您可以在冲突解决对话框中处理它。"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "请输入上传备注(最小 3 个字节)"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "非法的上传注解"
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>警告：</strong>密码会有<strong>一次</strong>以明文传送到 OSM 网"
-#~ "站。直到 OSM 服务器提供加密通讯频道(HTTPS)前<strong>不要</strong>使用重要"
-#~ "的密码。"
-
-#~ msgid "Active styles"
-#~ msgstr "使用中的样式"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "可用的样式(来自 {0})"
-
-#~ msgid ""
-#~ "<html>Failed to load the list of style sources from<br>\"{0}\"."
-#~ "<br><br>Details (untranslated):<br>{1}</html>"
-#~ msgstr ""
-#~ "<html>无法从这里载入样式来源清单：<br>“{0}”。<br><br>详细数据(未翻译):<br>"
-#~ "{1}</html>"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 主网站的信息或历史记录"
-#~ "页面可能会失败。API 基础 URL为：“{0}”"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat(镜像)"
-
-#~ msgid ""
-#~ "<html>JOSM is currently running with an anonymous user. It cannot "
-#~ "download<br>your changesets from the OSM server unless you enter your OSM "
-#~ "user name<br>in the JOSM preferences."
-#~ msgstr ""
-#~ "<html>JOSM 目前是以匿名用户执行。它无法从<br> OSM 服务器下载您的修改集合，"
-#~ "除非在JOSM 首选项<br>输入您的OSM 用户名。"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "另一个用来将图片与 GPX 文件中的路点配对的插件。配对的方式是当路点标签"
-#~ "的“name”、“cmt”或 ”desc“ 属性与图片的文件名相符时就是配对成功。"
-
-#~ msgid "license validation other"
-#~ msgstr "许可证验证器其他"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr "服务器内部错误。请尝试减小选择范围或者稍后再试。"
-
-#~ msgid "/PATH/TO/JOSM/FOLDER/ "
-#~ msgstr "/到/JOSM/文件夹/的路径/ "
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ " Java option to specify the maximum size of allocated memory in megabytes"
-#~ msgstr ""
-#~ "注意：在某些工作中，JOSM 需要大量的内存。因此有必要添加下列\n"
-#~ " Java 选项以 MB 来指定分配到内存的最大容量"
-
-#~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please "
-#~ "decide whether you want to <strong>keep</strong> these memberships for "
-#~ "the target node or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> the first node and "
-#~ "<strong>remove</strong> the other nodes that are members of the same "
-#~ "relation: the target node will take the place of the original node in the "
-#~ "relation."
-#~ msgstr ""
-#~ "<html>组合的节点是一或多个关系的成员。请决定您要<strong>保留</strong>目标"
-#~ "节点的这些成员或是<strong>删除</strong>它们。<br>默认值是<strong>保留</"
-#~ "strong>第一个节点并<strong>删除</strong>相同关系中其他节点的成员资格：目标"
-#~ "节点会取代关系中原本的节点。"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive \"{0}\"<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>这个关系已经有一或多个成员参照到<br>原型“{0}”<br><br>您确定要添加另"
-#~ "一个关系成员吗?</html>"
-
-#~ msgid "Icon paths"
-#~ msgstr "图标路径"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "为使用的样式添加文件名或 URL"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Checksum 错误： "
-
-#~ msgid ""
-#~ "Warning: failed to install plugin \"{0}\" from temporary download file "
-#~ "\"{1}\". Renaming failed."
-#~ msgstr "警告：无法从临时下载文件“{1}”安装插件“{0}”。仍然失败。"
-
-#~ msgid ""
-#~ "Warning: Failed to scan file \"{0}\" for plugin information. Skipping."
-#~ msgstr "警告：无法扫描文件“{0}”的插件信息。正在跳过。"
-
-#~ msgid ""
-#~ "<html>Communication with the OSM server \"{0}\" timed out. Please retry "
-#~ "later.</html>"
-#~ msgstr "<html>与 OSM 服务器“{0}”连接超时。请稍后再试。</html>"
-
-#~ msgid ""
-#~ "<html>Communication with the OSM server \"{0}\"failed. The server "
-#~ "replied<br>the following error code and the following error message:"
-#~ "<br><strong>Error code:<strong> {1}<br><strong>Error message "
-#~ "(untranslated)</strong>: {2}</html>"
-#~ msgstr ""
-#~ "<html>与 OSM 服务器“{0}”连接失败。服务器返回<br>下列错误代码与信息："
-#~ "<br><strong>错误代码：<strong> {1}<br><strong>错误信息</strong>: {2}</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>\"{0}\"<br>for "
-#~ "security reasons. This is most likely because you are running<br>in an "
-#~ "applet and because you did not load your applet from \"{1}\".</html>"
-#~ msgstr ""
-#~ "<html>基于安全性的理由无法连接到远程服务器<br>“{0}”<br>这大部分是因为您以 "
-#~ "applet 执行<br>以及您没有从 \"{1}\" 载入 applet。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to open a connection to the remote server<br>\"{0}\"."
-#~ "<br>Please check your internet connection.</html>"
-#~ msgstr ""
-#~ "<html>无法连接到远程服务器<br>“{0}”<br>请检查您的互联网网络连接。</html>"
-
-#~ msgid "The OSM server ''{0}''reported a bad request.<br>"
-#~ msgstr "OSM 服务器“{0}”回复了错误的要求。<br>"
-
-#~ msgid "Parameter \"{0}\" must not be null"
-#~ msgstr "参数“{0}”不能为空"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "点击解开建筑(只适用矢量图片)"
-
-#~ msgid "Add grid"
-#~ msgstr "添加格线"
-
-#~ msgid "change the selection"
-#~ msgstr "改变选择范围"
-
-#~ msgid "Remove node \"{0}\" at position {1} from relation ''{2}''"
-#~ msgstr "从关系“{2}”删除位置 {1} 的节点“{0}”"
-
-#~ msgid "Remove way \"{0}\" at position {1} from relation ''{2}''"
-#~ msgstr "从关系“{2}”删除位置 {1} 的路径“{0}”"
-
-#~ msgid "Remove relation \"{0}\" at position {1} from relation ''{2}''"
-#~ msgstr "从关系“{2}”删除位置 {1} 的关系“{0}”"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action \"{0}\" "
-#~ "behind shortcut \"{1}\" by action ''{2}''"
-#~ msgstr ""
-#~ "警告：turnrestrictions 插件将快捷键“{1}”原本的动作“{0}”替换成动作“{2}”"
-
-#~ msgid ""
-#~ "Cannot add object \"{0}\" as relation member because it is deleted or "
-#~ "invisible in layer \"{1}\""
-#~ msgstr ""
-#~ "不能将对象 \"{0}\" 添加为关系成员，因为它已被删除或是在图层 \"{1}\" 中是不"
-#~ "可视的"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL(默认值)"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>这个关系已经有一或多个成员参照到<br>原型 \"{0}\"<br><br>您确定要添加"
-#~ "另一个关系成员吗?</html>"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM 发现 {0} 个未保存的 OSM 数据图层。它看上去像是 JOSM 上一次崩溃时留下"
-#~ "的。您想恢复数据吗?"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "拖曳以移动对象；按 Shift 以添加到选择范围(Ctrl 可切换)；Shift-Ctrl 以旋转"
-#~ "选取；或改变选择范围"
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "添加一条带有角色“出发”的 OSM 路径"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "添加一条带有角色“到达”的 OSM 路径"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} 将工作，但这个插件的远程控制功能将被禁用。\n"
-#~ "您应该更新插件。"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "启用内置默认值"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "复制选取的默认值"
-
-#~ msgid ""
-#~ "Warning: Missing preference file \"{0}\". Creating a default preference "
-#~ "file."
-#~ msgstr "警告：缺少首选项文件 \"{0}\"。正在建立默认首选项文件。"
-
-#~ msgid ""
-#~ "Warning: Replacing existing preference file \"{0}\" with default "
-#~ "preference file."
-#~ msgstr "警告：以默认首选项文件取代现有的首选项文件 \"{0}\"。"
-
-#~ msgid ""
-#~ "Warning: illegal value \"{0}\" for preference key \"{1}\". Falling back "
-#~ "to default value ''shift ctrl T''."
-#~ msgstr ""
-#~ "警告：首选项键 \"{1}\" 有不合格的数值 \"{0}\"。返回到默认值 \"shift ctrl T"
-#~ "\"。"
-
-#~ msgid ""
-#~ "Warning: the preference with key \"{0}\" has an unsupported value "
-#~ "\"{1}\". Assuming the default value ''set-a''."
-#~ msgstr ""
-#~ "警告：首选项键 \"{0}\" 有不支持的数值 \"{1}\"。推测默认数值应为 \"set-a"
-#~ "\"。"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "发生异常这是一个程序错误，如果您正在运行最新版本的 JOSM，请考虑提交错误报"
-#~ "告。"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "无法重命名文件“{0}”。"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "“{0}”尚未封闭因此不能连结。"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>图层“{0}”已有冲突发生于原型<br>“{1}”。 <br>这个冲突不能被添加。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from \"{0}\" for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr "基于安全性的理由无法从“{0}”载入书签。例外为：{1}"
-
-#~ msgid ""
-#~ "Cannot compare primitive with ID \"{0}\" to primitive with ID \"{1}\"."
-#~ msgstr "不能比较 ID“{0}”和 ID“{1}”的原型。"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding \"{0}\"<br>was missing "
-#~ "on this system.</html>"
-#~ msgstr "<html>无法建立 URL，因为编码“{0}”<br>在这个系统中并不存在。</html>"
-
-#~ msgid ""
-#~ "<html>The selected object is not available in the current<br>edit layer "
-#~ "\"{0}\"."
-#~ msgid_plural ""
-#~ "<html>None of the selected objects is available in the current<br>edit "
-#~ "layer \"{0}\"."
-#~ msgstr[0] "<html>在目前编辑的图层“{0}”中没有选取的<br>对象可用。"
-
-#~ msgid ""
-#~ "<html>You are trying to add a relation to itself.<br><br>This creates "
-#~ "circular references and is therefore discouraged.<br>Skipping relation "
-#~ "\"{0}\".</html>"
-#~ msgstr ""
-#~ "<html>您正尝试将关系添加到它自己。<br><br>这样会建立循环参照，因此不建议这"
-#~ "么做。<br>正跳过关系“{0}”。</html>"
-
-#~ msgid ""
-#~ "<html>Layer \"{0}\" already has a conflict for primitive<br>\"{1}\"."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>图层“{0}”已经有冲突于原型<br>“{1}”。 <br>请先调解这个冲突，然后再试"
-#~ "一次。</html>"
-
-#~ msgid ""
-#~ "<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
-#~ "possible for help topics<br>on the help server <tt>{1}</tt>."
-#~ msgstr ""
-#~ "<html>目前的 URL <tt>{0}</tt><br> 是外部 URL。编辑帮助主题只能在<br>帮助服"
-#~ "务器 <tt>{1}</tt> 进行。"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> currently edited in layer \"{1}\"</"
-#~ "html>"
-#~ msgstr "<html>版本 <strong>{0}</strong> 目前在图层“{1}”中编辑</html>"
-
-#~ msgid ""
-#~ "Authenticating at the OSM API \"{0}\" failed. Please enter a valid "
-#~ "username and a valid password."
-#~ msgstr "在 OSM API“{0}”验证失败。请输入有效的用户名和密码。"
-
-#~ msgid ""
-#~ "Authenticating at the HTTP proxy \"{0}\" failed. Please enter a valid "
-#~ "username and a valid password."
-#~ msgstr ""
-#~ "<html>在 HTTP 代理服务器“{0}”验证失败。请输入有效的用户名 和密码。</html>"
-
-#~ msgid ""
-#~ "Layer \"{0}\" has modifications which should be saved to its associated "
-#~ "file \"{1}\"."
-#~ msgstr "图层“{0}”已被修改，应保存到它关联的文件“{1}”。"
-
-#~ msgid ""
-#~ "Warning: primitive \"{0}\" is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr "警告：原型“{0}”已在服务器上删除了。正跳过这个原型并尝试重新上传。"
-
-#~ msgid ""
-#~ "Warning: object \"{0}\" is already deleted on the server. Skipping this "
-#~ "object and retrying to upload."
-#~ msgstr ""
-#~ "警告：对象“{0}”已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer \"{0}\" has been downloaded from the "
-#~ "server.<br>Because its way points do not include a timestamp we cannot "
-#~ "correlate them with audio data.</html>"
-#~ msgstr ""
-#~ "<html>GPX 图层“{0}”中的数据已从服务器下载。<br>因为它的路点并不包含时间戳"
-#~ "记，我们不能将它们与声音数据关联。</html>"
-
-#~ msgid ""
-#~ "<html>The data in the GPX layer \"{0}\" has been downloaded from the "
-#~ "server.<br>Because its way points do not include a timestamp we cannot "
-#~ "correlate them with images.</html>"
-#~ msgstr ""
-#~ "<html>GPX 图层“{0}“ 中的数据已从服务器下载。<br>因为它的路点并不包含时间戳"
-#~ "记，我们不能将它们与照片关联。</html>"
-
-#~ msgid ""
-#~ "Warning: failed to load Mappaint styles from \"{0}\". Exception was: {1}"
-#~ msgstr "警告：从“{0}”载入 Mappaint 样式失败。例外为：{1}"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from \"{0}\". Exception was: {1}"
-#~ msgstr "警告：从“{0}”解析 Mappaint 样式失败。例外为：{1}"
-
-#~ msgid ""
-#~ "Please enter an OAuth Access Token which is authorized to access the OSM "
-#~ "server \"{0}\"."
-#~ msgstr "请输入已获授权访问 OSM 服务器“{0}”的 OAuth 访问令牌。"
-
-#~ msgid ""
-#~ "<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
-#~ "Token from \"{1}\".</html>"
-#~ msgstr ""
-#~ "<html>请点击 <strong>{0}</strong> 从“{1}”取回 OAuth 要求令牌。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to access the OSM server \"{0}\"<br>with the Access Token "
-#~ "\"{0}\".<br>The server rejected the Access Token as unauthorized. You "
-#~ "will not<br>be able to access any protected resource on this server using "
-#~ "this token.</html>"
-#~ msgstr ""
-#~ "<html>无法访问 OSM 服务器“{0}”<br>访问令牌为“{0}”。<br>服务器将访问令牌视"
-#~ "为未授权而拒绝。您将<br>无法使用这个令牌访问服务器上任何受保护的资源。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>The Access Token \"{1}\" is known to the OSM server \"{0}\".<br>The "
-#~ "test to retrieve the user details for this token failed, though."
-#~ "<br>Depending on what rights are granted to this token you may "
-#~ "nevertheless use it<br>to upload data, upload GPS traces, and/or access "
-#~ "other protected resources.</html>"
-#~ msgstr ""
-#~ "<html>访问令牌“{1}”是用于 OSM 服务器“{0}”。<br>然而，以这个令牌测试取回用"
-#~ "户详细数据却失败了。<br>依据这个令牌获得的权限您仍有可能使用它<br>上传数"
-#~ "据、GPS 轨迹和/或访问其他受保护的资源。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to retrieve information about the current user from the OSM "
-#~ "server \"{0}\".<br>This is probably not a problem caused by the tested "
-#~ "Access Token, but<br>rather a problem with the server configuration. "
-#~ "Carefully check the server<br>URL and your Internet connection.</html>"
-#~ msgstr ""
-#~ "<html>无法从 OSM 服务器“{0}”取回关于目前用户的信息。<br>这可能是测试的访问"
-#~ "令牌造成的问题，但<br>也可能是否应服务器组态的问题。请仔细检查服务器"
-#~ "<br>URL 和您的互联网网络连接。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to sign the request for the OSM server \"{0}\" with the "
-#~ "token \"{1}\".<br>The token ist probably invalid.</html>"
-#~ msgstr ""
-#~ "<html>无法使用令牌“{1}”签署用于 OSM 服务器“{0}”的要求。<br>这个令牌可能是"
-#~ "无效的。</html>"
-
-#~ msgid ""
-#~ "<html>\"{0}\" is not a valid OSM API URL.<br>Please check the spelling "
-#~ "and validate again.</html>"
-#~ msgstr ""
-#~ "<html>“{0}”不是有效的 OSM API URL。<br>请检查拼写后再验证一次。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to build URL \"{0}\" for validating the OSM API server."
-#~ "<br>Please check the spelling of \"{1}\" and validate again.</html>"
-#~ msgstr ""
-#~ "<html>无法建立 URL“{0}”来验证 OSM API 服务器。<br>请检查“{1}”的拼写后再验"
-#~ "证一次。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to connect to the URL \"{0}\".<br>Please check the spelling "
-#~ "of \"{1}\" and your Internet connection and validate again.</html>"
-#~ msgstr ""
-#~ "<html>无法建立到 URL“{0}”的连接。<br>请检查“{1}”的拼写与您的互联网网络连接"
-#~ "后再验证一次。</html>"
-
-#~ msgid ""
-#~ "<html>The OSM API server at \"{0}\" did not return a valid response."
-#~ "<br>It is likely that \"{0}\" is not an OSM API server.<br>Please check "
-#~ "the spelling of \"{0}\" and validate again.</html>"
-#~ msgstr ""
-#~ "<html>OSM API 服务器“{0}”并未传回有效的回应。<br>可能“{0}”不是 OSM API 服"
-#~ "务器。<br>请检查“{0}”的拼写并再验证一次。</html>"
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "损坏的预设组合“{0}-{1}”- 在 display_values 中项目的数量必须和数值里的相同"
-
-#~ msgid ""
-#~ "Error: Connection to proxy \"{0}\" for URI \"{1}\" failed. Exception was: "
-#~ "{2}"
-#~ msgstr "错误：以代理服务器“{0}”连接到 URI“{1}”失败。例外为：{2}"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute \"{0}\" of type long (>=0). Got "
-#~ "\"{1}\"."
-#~ msgstr "类型 long(>=0)的必要属性“{0}”有不合格的数值。得到“{1}”。"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute \"{0}\" of type double. Got \"{1}\"."
-#~ msgstr "类型 double 的必要属性“{0}”有不合格的数值。得到“{1}”。"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute \"{0}\" of type boolean. Got "
-#~ "\"{1}\"."
-#~ msgstr "类型 boolean 的必要属性“{0}”有不合格的数值。得到“{1}”。"
-
-#~ msgid ""
-#~ "Illegal value for mandatory attribute \"{0}\" of type OsmPrimitiveType. "
-#~ "Got \"{1}\"."
-#~ msgstr "类型 OsmPrimitiveType 的必要属性“{0}”有不合格的数值。得到“{1}”。"
-
-#~ msgid ""
-#~ "Missing manadatory attributes on element ''bounds''. Got minlon=\"{0}\","
-#~ "minlat=\"{1}\",maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 #~ msgstr ""
 #~ "元素“bounds”缺少必要的属性。得到 minlon=\"{0}\",minlat=\"{1}\",maxlon="
@@ -45329,126 +43391,34 @@
 
 #~ msgid ""
-#~ "Way with external ID \"{0}\" includes missing node with external ID "
-#~ "\"{1}\"."
-#~ msgstr "外部 ID“{0}”的路径包含了缺少的外部 ID“{1}”的节点。"
+#~ "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
+#~ "tune simplification"
+#~ msgstr "按回车以简化或保存，Ctrl-回车以带标签保存，向上/向下以调整简化程度"
 
 #~ msgid ""
-#~ "Relation with external id \"{0}\" refers to a missing primitive with "
-#~ "external id \"{1}\"."
-#~ msgstr "外部 id“{0}”的关系包含了缺少的外部 id“{1}”的原型。"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
+#~ msgstr ""
+#~ "(将首选项中的“{0}”设置为 是/否/询问\n"
+#~ "以控制校准文件的自动载入)"
 
 #~ msgid ""
-#~ "Warning: Cannot download plugin ''{0}''. Its download link ''{1}''is not "
-#~ "a valid URL. Skipping download."
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "警告：不能下载插件“{0}”。它的下载连接“{1}”不是有效的 URL。正在跳过下载。"
+#~ "将首选项中的“{0}”设置为 是/否/询问，\n"
+#~ "以控制校准文件的自动载入。"
+
+#~ msgid "Download referrers for the the chosen relation and its members"
+#~ msgstr "下载选定关系及它的成员的参照"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "为选定的转弯限制开启编辑器"
 
 #~ msgid ""
-#~ "Warning: failed to install already downloaded plugin \"{0}\". Skipping "
-#~ "installation. JOSM is still going to load the old plugin version."
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
 #~ msgstr ""
-#~ "警告：无法安装已下载的插件“{0}”。正在跳过安装。JOSM 仍然会载入旧的插件版"
-#~ "本。"
-
-#~ msgid ""
-#~ "<html>Failed to authenticate at the OSM server \"{0}\".<br>You are using "
-#~ "OAuth to authenticate but currently there is no<br>OAuth Access Token "
-#~ "configured.<br>Please open the Preferences Dialog and generate or enter "
-#~ "an Access Token.</html>"
-#~ msgstr ""
-#~ "<html>无法验证 OSM 服务器“{0}”。<br>您正使用 OAuth 验证但目前尚未设定"
-#~ "<br>OAuth 访问令牌。<br>请开启首选项对话框并产生或输入访问令牌。</html>"
-
-#~ msgid ""
-#~ "<html>Authentication at the OSM server with the OAuth token \"{0}\" "
-#~ "failed.<br>Please launch the preferences dialog and retrieve another "
-#~ "OAuth token.</html>"
-#~ msgstr ""
-#~ "<html>以 OAuth 访问令牌“{0}”验证 OSM 服务器失败。<br>请执行首选项对话框并"
-#~ "取回另一个 OAuth 访问令牌。</html>"
-
-#~ msgid ""
-#~ "<html>Authorisation at the OSM server with the OAuth token \"{0}\" failed."
-#~ "<br>The token is not authorised to access the protected resource<br>"
-#~ "\"{1}\".<br>Please launch the preferences dialog and retrieve another "
-#~ "OAuth token.</html>"
-#~ msgstr ""
-#~ "<html>以 OAuth 访问令牌“{0}”验证 OSM 服务器失败。<br>这个令牌未获授权访问"
-#~ "受保护的资源<br>“{1}”。<br>请执行首选项对话框并取回另一个 OAuth 存取令牌。"
-#~ "</html>"
-
-#~ msgid ""
-#~ "Warning: Unexpected parameters for SOCKS proxy. Got host \"{0}\" and port "
-#~ "\"{1}\"."
-#~ msgstr "警告：意外的 SOCKS 代理服务器参数。得到主机“{0}”和端口“{1}”。"
-
-#~ msgid ""
-#~ "<html>Failed to upload data to or download data from<br>\"{0}\"<br>due to "
-#~ "a problem with transferring data.<br>Details(untranslated): {1}</html>"
-#~ msgstr ""
-#~ "<html>无法由此上传或下载数据：<br>“{0}”<br>因为传输数据有问题。<br>详细数"
-#~ "据(未翻译)：{1}</html>"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>无法载入插件 {0} ，因为插件<br>主类别“{1}”找不到。<br>是否从首选项删"
-#~ "除?"
-
-#~ msgid ""
-#~ "Warning: unexpected value for preference \"{0}\", got \"{1}\". Resetting "
-#~ "to default query."
-#~ msgstr "警告：首选项“{0}”有意外的数值，得到“{1}”。重设为默认查询。"
-
-#~ msgid ""
-#~ "Unexpected value \"{0}\" for preference \"{1}\". Assuming value ''ask''."
-#~ msgstr "首选项“{1}”有意外的数值“{0}”。推测数值应为“ask”。"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class \"{1}\" "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>无法载入插件 {0} 因为插件<br>主类别“{1}”找不到。<br>是否从首选项删"
-#~ "除?"
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "“{0}”是一个目录。预计应该是一个 jar 档案。"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "输入新节点的坐标。<br/>您可以用空白、逗号或分号来分隔经度和纬度。<br/>使用"
-#~ "正数或 N, E 字符来代表北方或东方主方向。<br/>而南方和西方主方向则可以使用"
-#~ "负数或 S, W 字符。<br/>坐标值可以是下列三种格式之一：<ul><li><i>度</"
-#~ "i><tt>&deg;</tt></li><li><i>度</i><tt>&deg;</tt> <i>分</i><tt>&#39;</tt></"
-#~ "li><li><i>度</i><tt>&deg;</tt> <i>分</i><tt>&#39;</tt> <i>秒</"
-#~ "i><tt>&quot</tt></li></ul>符号 <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;"
-#~ "</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> 是选择性的。<br/><br/>一些范例："
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
+#~ "插件 cadastre-fr 一般使用功能键 F11 为快捷键\n"
+#~ "但它目前是默认分配给全屏切换使用\n"
+#~ "您是否想要恢复以 F11 作为抓取动作？"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 26529)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 26530)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:02+0200\n"
+"POT-Creation-Date: 2011-08-11 23:27+0200\n"
 "PO-Revision-Date: 2011-07-17 04:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,10 +17,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-31 11:36+0000\n"
-"X-Generator: Launchpad (build 13543)\n"
+"X-Launchpad-Export-Date: 2011-08-11 16:36+0000\n"
+"X-Generator: Launchpad (build 13662)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:244
+#: ../core/src/org/openstreetmap/josm/Main.java:245
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
@@ -35,12 +35,12 @@
 msgstr "說明"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:482
+#: ../core/src/org/openstreetmap/josm/Main.java:483
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的檔案 URL： \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:483
-#: ../core/src/org/openstreetmap/josm/Main.java:516
-#: ../core/src/org/openstreetmap/josm/Main.java:603
+#: ../core/src/org/openstreetmap/josm/Main.java:484
+#: ../core/src/org/openstreetmap/josm/Main.java:517
+#: ../core/src/org/openstreetmap/josm/Main.java:604
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -77,10 +77,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -95,6 +95,7 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -118,14 +119,14 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:515
+#: ../core/src/org/openstreetmap/josm/Main.java:516
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "參數「downloadgps」不能使用檔案名稱或檔案 URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:602
+#: ../core/src/org/openstreetmap/josm/Main.java:603
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "忽略不正確的 URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:753
+#: ../core/src/org/openstreetmap/josm/Main.java:754
 #, java-format
 msgid ""
@@ -138,13 +139,13 @@
 "本。</li></ul>更多資訊："
 
-#: ../core/src/org/openstreetmap/josm/Main.java:768
+#: ../core/src/org/openstreetmap/josm/Main.java:769
 msgid "Exit JOSM"
 msgstr "結束 JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:769
+#: ../core/src/org/openstreetmap/josm/Main.java:770
 msgid "Continue, try anyway"
 msgstr "繼續，強制再試一次"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:770
+#: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -164,7 +165,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1084
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:888
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
@@ -174,6 +175,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:693
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
@@ -204,5 +205,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:976
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
@@ -386,6 +387,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -412,5 +413,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -418,7 +419,8 @@
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:73
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:331
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
@@ -426,5 +428,5 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:360
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
@@ -633,5 +635,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
@@ -877,5 +879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -884,5 +886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:172
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
@@ -1063,6 +1065,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:67
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
 msgid "Ok"
@@ -1213,5 +1215,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
@@ -1429,6 +1431,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
 msgstr "URL"
@@ -2074,5 +2076,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
@@ -2374,7 +2376,7 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:879
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
 msgstr "下載資料"
@@ -2627,6 +2629,6 @@
 #, java-format
 msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr "忽略的例外，因為下載已被取消。例外為：{0}"
+"Ignoring exception because download has been canceled. Exception was: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2749,10 +2751,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2913,5 +2915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:99
@@ -3494,5 +3496,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
-msgid "Supicious data found. Upload anyway?"
+msgid "Suspicious data found. Upload anyway?"
 msgstr ""
 
@@ -3542,40 +3544,40 @@
 msgstr "{0} 已變更的節點"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "從節點「{1}」移除「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
 msgstr "從路徑「{1}」移除「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
 msgstr "從關係「{1}」移除「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
 msgstr "在節點「{2}」設定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
 msgstr "在路徑「{2}」設定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
 msgstr "在關係「{2}」設定 {0}={1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} objects"
 msgstr "從 {1} 物件移除「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} objects"
@@ -3694,4 +3696,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
 msgid "Delete confirmation"
 msgstr "刪除動作確認"
@@ -3988,7 +3991,7 @@
 #, java-format
 msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr "警告：初始化偏好設定失敗。無法將偏好設定重設為預設值：{0}"
+"Warning: Failed to initialize preferences. Failed to reset preference file "
+"to default: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4024,6 +4027,6 @@
 #, java-format
 msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr "警告：在修訂版檔案中有未預期的 JOSM 版本號碼，數值為「{0}」"
+"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4126,9 +4129,7 @@
 msgid ""
 "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"Please report this at http://josm.openstreetmap.de/. This is not a critical "
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM 預期在資料組合中會找到原型 [{0} {1}] 但卻沒有。請在 http://josm."
-"openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4226,5 +4227,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:598
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
 msgid "relation"
 msgid_plural "relations"
@@ -4242,8 +4243,8 @@
 msgstr "多重多邊形"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:644
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
@@ -4383,50 +4384,64 @@
 msgstr "WGS84 地理座標"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:102
-#, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
+#, java-format
+msgid "Error: failed to open input stream for resource ''/data/{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
+msgid "Gauß-Krüger"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
+msgid "GK Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
+#, java-format
+msgid ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
 "NTF<->RGF93 grid"
-msgstr "警告：無法開啟資源「/data/{0}」的輸入串流。不能載入 NTF<->RGF93 格線"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:139
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 msgid "Lambert 4 Zones (France)"
 msgstr "蘭勃特 4 區域 (法國)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:147
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:108
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:109
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:110
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:112
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:113
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:114
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:115
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:116
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
 msgstr "{0} ({1} 到 {2} 度)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:254
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:150
 #, java-format
 msgid "{0} (Corsica)"
 msgstr "{0} (科西嘉島)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:263
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:159
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:125
 msgid "Lambert CC Zone"
 msgstr "蘭勃特 CC 區"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:69
 msgid "Lambert CC9 Zone (France)"
 msgstr "蘭勃特 CC9 區 (法國)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:35
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (愛沙尼亞)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:39
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:31
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/Mercator.java:15
 msgid "Mercator"
 msgstr "麥卡托投影"
@@ -4451,81 +4466,101 @@
 msgstr "實作「{0}」投影法類別錯誤：不能將偏好設定符合代碼「{1}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
 msgstr "PUWG (波蘭)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:107
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
 msgstr "PUWG 區"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:188
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (波蘭)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:214
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
 msgstr "PUWG 2000 區 {0} (波蘭)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:125
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
 msgid "Swiss Grid (Switzerland)"
 msgstr "Swiss Grid (瑞士)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
+#: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
 msgstr "LKS-92 (拉脫維亞 TM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:90
 msgid "UTM"
 msgstr "UTM"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
 msgstr "UTM 區"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:298
 msgid "North"
 msgstr "北"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:148
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:153
 msgid "South"
 msgstr "南"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:157
 msgid "Hemisphere"
 msgstr "球面投影（Hemisphere）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
 msgstr "東移 3.000.000m"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
 msgid "Guadeloupe Fort-Marigot 1949"
 msgstr "Guadeloupe Fort-Marigot 1949"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:31
 msgid "Guadeloupe Ste-Anne 1948"
 msgstr "Guadeloupe Ste-Anne 1948"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:32
 msgid "Martinique Fort Desaix 1952"
 msgstr "Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
 msgstr "留尼旺 RGR92"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
 msgid "Guyane RGFG95"
 msgstr "Guyane RGFG95"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:97
 msgid "UTM France (DOM)"
 msgstr "UTM 法國 (DOM)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:126
 msgid "UTM Geodesic system"
 msgstr "UTM 大地測量系統"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
+msgid "GRS80"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
+msgid "WGS84"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
+msgid "Lambert Conformal Conic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
+msgid "Swiss Oblique Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
+msgid "Transverse Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4744,45 +4779,45 @@
 msgstr "這個測試會檢查多重多邊形是否有效"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
 msgid "Area style way is not closed"
 msgstr "區域類型的路徑並未封閉"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:137
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
 msgid "No outer way for multipolygon"
 msgstr "多重多邊形沒有外部路徑"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:173
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
 msgid "No style for multipolygon"
 msgstr "多重多邊形中沒有樣式"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
 msgid "No style in multipolygon relation"
 msgstr "在多重多邊形關係中沒有樣式"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:193
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
 msgid "Style for inner way equals multipolygon"
 msgstr "內部路徑的樣式等同多重多邊形"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:210
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:212
 msgid "Style for outer way mismatches"
 msgstr "外部路徑的樣式不符"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:221
 msgid "Multipolygon is not closed"
 msgstr "多重多邊形並未封閉"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:241
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
 msgid "Multipolygon inner way is outside"
 msgstr "多重多邊形的內部路徑超出外圍"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:247
 msgid "Intersection between multipolygon ways"
 msgstr "多重多邊形之間有交集"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:255
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
 msgid "No useful role for multipolygon member"
 msgstr "多重多邊形成員沒有有用的角色"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:262
 msgid "Non-Way in multipolygon"
 msgstr "多重多邊形內沒有路徑"
@@ -5051,5 +5086,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
@@ -5074,5 +5109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1077
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5083,5 +5118,5 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:287
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:168
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:182
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
@@ -5489,5 +5524,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:514
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
 #, java-format
 msgid " [id: {0}]"
@@ -5553,5 +5588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 msgid "highway"
 msgstr "公路"
@@ -5559,5 +5594,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:569
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
 #: build/trans_presets.java:4149
 msgid "railway"
@@ -5565,10 +5600,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:570
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
 msgid "waterway"
 msgstr "航道"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:571
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
 msgid "landuse"
 msgstr "土地利用"
@@ -5578,5 +5613,5 @@
 #. I18n: count of nodes as parameter
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:576
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
@@ -5589,5 +5624,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:626
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
 #, java-format
 msgid "{0} member"
@@ -5599,5 +5634,5 @@
 msgstr "大眾運輸"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:462
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5954,5 +5989,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6061,4 +6096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:463
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -6162,5 +6198,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6204,10 +6240,7 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
 "html>"
 msgstr ""
-"<html>或者您也可以輸入<strong>拼貼位址</strong>指定單一拼貼，格式為 "
-"<i>zoomlevel/x/y</i>，例如 <i>15/256/223</i>。拼貼位址的格式如 <i>zoom,x,y</"
-"i> 或 <i>zoom;x;y</i> 也是可以使用的。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6490,7 +6523,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
 msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr "合併元件的清單。它們會在合併決定被接受時取代我的元件。"
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6714,10 +6747,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
-msgid "Keep my coordiates"
-msgstr "保留我的坐標"
+msgid "Keep my coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Keep their coordiates"
-msgstr "保留他們的坐標"
+msgid "Keep their coordinates"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -6773,6 +6806,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6794,6 +6827,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:259
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7188,5 +7221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7427,5 +7460,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
@@ -7639,7 +7672,37 @@
 msgstr ""
 
+#. item "Ways/Path" combo "Wheelchairs" display value
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
+#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
+#. item "Transport/Railway/Crossing" combo "Crossing type" display value
+#. item "Car/Parking" combo "Spaces for Disabled" display value
+#. item "Car/Parking" combo "Spaces for Women" display value
+#. item "Car/Parking" combo "Spaces for Parents" display value
+#. item "Leisure/Sauna" combo "Access" display value
+#. item "Facilities/Hunting Stand" combo "Shelter" display value
+#. item "Facilities/Hunting Stand" combo "Hide" display value
+#. item "Facilities/Hunting Stand" combo "Lock" display value
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
-msgid "unkown"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
+#: build/trans_presets.java:566 build/trans_presets.java:611
+#: build/trans_presets.java:744 build/trans_presets.java:766
+#: build/trans_presets.java:1378 build/trans_presets.java:1451
+#: build/trans_presets.java:1452 build/trans_presets.java:1453
+#: build/trans_presets.java:2228 build/trans_presets.java:2564
+#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
+msgid "unknown"
+msgstr "不明"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
@@ -7903,5 +7966,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
@@ -7921,5 +7984,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
@@ -7936,5 +7999,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
 msgid "Download incomplete members of selected relations"
 msgstr "下載已選取關係的不完整成員"
@@ -7942,5 +8005,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
 msgid "Download incomplete members"
 msgstr "下載不完整的成員"
@@ -7983,5 +8046,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7989,5 +8052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
@@ -8180,5 +8243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:138
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:196
 msgid "Close the dialog"
@@ -8280,5 +8343,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:51
 msgid "User"
 msgstr "使用者"
@@ -9271,5 +9333,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
@@ -9451,5 +9513,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:157
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -9593,4 +9655,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
 msgstr "只有我自己擁有的變更組合"
@@ -9603,4 +9666,10 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr "只有由下列使用者名稱擁有的變更組合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:495
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -9880,9 +9949,9 @@
 msgstr "這個變更組合查詢 URL 是無效的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
 msgid "Add Properties"
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
 #, java-format
 msgid "This will change {0} object."
@@ -9890,13 +9959,13 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
 msgid "An empty value deletes the tag."
 msgstr "空白的數值代表刪除該標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:256
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:693
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
@@ -9909,18 +9978,19 @@
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
-msgid "Change values?"
-msgstr "是否改變數值？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+msgid "Change value?"
+msgid_plural "Change values?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
 #, java-format
 msgid ""
@@ -9929,5 +9999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -9936,5 +10006,5 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
 #, java-format
 msgid "This will change up to {0} object."
@@ -9942,27 +10012,31 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
 msgid "Please select a value"
 msgstr "請選擇一個數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+msgid "Add value?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
 msgid "Please select the objects you want to change properties for."
 msgstr "請選擇您要改變屬性的物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
 msgid "Properties/Memberships"
 msgstr "屬性/成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
 msgid "Properties for selected objects."
 msgstr "選取物件的屬性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9971,62 +10045,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
 #: build/trans_presets.java:2588
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1050
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1124
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "前往 OSM wiki 取得標籤說明 (F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1125
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr "執行瀏覽器顯示選取物件的 wiki 說明"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1225
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr "選擇主要選擇區域的關係。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10089,9 +10163,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:106
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:74
 #, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr "警告：忽略例外，因為工作已取消。例外：{0}"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10112,6 +10188,7 @@
 #, java-format
 msgid "Downloading {0} incomplete child of {1} parent relations"
-msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] "正在下載 {1} 父關係的 {0} 個不完整子項"
+msgid_plural "Downloading {0} incomplete children of {1} parent relations"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -10450,9 +10527,4 @@
 msgstr "匯入時有 {0} 個衝突。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
-#, java-format
-msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-msgstr "警告：因為工作已取消，忽略例外。例外為：{0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
@@ -10493,10 +10565,4 @@
 msgid "Load relation"
 msgstr "載入關係"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:158
-#, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "警告：忽略例外，因為工作已取消。例外：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79
@@ -10775,37 +10841,4 @@
 msgstr "類型"
 
-#. item "Ways/Path" combo "Wheelchairs" display value
-#. item "Ways/Dedicated Cycleway" combo "Pedestrians" display value
-#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
-#. item "Waypoints/Pedestrian Crossing" combo "Type" display value
-#. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#. item "Car/Parking" combo "Spaces for Disabled" display value
-#. item "Car/Parking" combo "Spaces for Women" display value
-#. item "Car/Parking" combo "Spaces for Parents" display value
-#. item "Leisure/Sauna" combo "Access" display value
-#. item "Facilities/Hunting Stand" combo "Shelter" display value
-#. item "Facilities/Hunting Stand" combo "Hide" display value
-#. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:52
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:35
-msgid "unknown"
-msgstr "不明"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
 msgid "Slippy map"
@@ -10928,20 +10961,20 @@
 msgstr "坐標"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:51
 #, java-format
 msgid "History for node {0}"
 msgstr "節點 {0} 的歷史紀錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
 msgstr "路徑 {0} 的歷史紀錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
 msgstr "關係 {0} 的歷史紀錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
 msgstr "重新載入伺服器的歷史紀錄"
@@ -11033,6 +11066,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
-msgid "Changeset"
-msgstr "變更組合"
+msgid "Changeset:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11589,11 +11622,10 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
+"canceled or has failed.</html>"
 msgid_plural ""
 "<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+"canceled or have failed.</html>"
 msgstr[0] ""
-"<html>上傳和/或儲存的選項，用於 {0} 個修改過的圖層<br>被取消或有錯誤時。</"
-"html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
@@ -12009,4 +12041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
 msgid ""
@@ -12037,13 +12070,4 @@
 "<html>不能以一次要求上傳 {0} 個物件，因為超過了伺服器「{2}」<br>的最大變更組"
 "合大小 {1}。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
-#, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種方"
-"式？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -12115,38 +12139,38 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1298
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1297
 msgid "Customize Color"
 msgstr "自訂顏色"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1303
 msgid "Default"
 msgstr "預設值"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:71
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1308
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1307
 msgid "Choose a color"
 msgstr "選擇一種顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:147
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:280
 #, java-format
 msgid "Name: {0}"
 msgstr "名稱：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:284
 #, java-format
 msgid "Description: {0}"
 msgstr "描述：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
 msgid "{0} track"
@@ -12156,9 +12180,9 @@
 #. item "Relations/Route" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
 #: build/trans_presets.java:4153
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
@@ -12166,26 +12190,26 @@
 msgstr "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr "時間跨度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr "長度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:298
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
 #, java-format
 msgid "Length: {0}"
 msgstr "長度：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:295
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
 #, java-format
 msgid "{0} route, "
@@ -12193,8 +12217,8 @@
 msgstr[0] "{0} 路線， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:223
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
 #, java-format
 msgid "{0} waypoint"
@@ -12202,12 +12226,12 @@
 msgstr[0] "{0} 航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:246
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "gps 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:294
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
 msgid "{0} track, "
@@ -12215,10 +12239,10 @@
 msgstr[0] "{0} 軌跡， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12228,78 +12252,78 @@
 "請看這裡：</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:684
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:686
 #, java-format
 msgid "Converted from: {0}"
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:706
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:744
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:867
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:708
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:746
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:714
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:717
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
 #, java-format
 msgid "{0} meters"
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:723
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:726
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:732
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr "下載接近："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr "只有軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr "只有航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:847
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr "軌跡與航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:859
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
 #, java-format
 msgid ""
@@ -12309,11 +12333,11 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:968
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -12321,6 +12345,6 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -12328,27 +12352,27 @@
 msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1385
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1419
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
 msgid "Customize track drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1434
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
 msgstr "已命名點的標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1450
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名軌跡點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1462
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "匯入音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1467
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
 msgid ""
@@ -12360,29 +12384,29 @@
 "記，我們不能將它們與聲音資料關聯。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1474
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1564
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1371
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1459
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
 msgstr "不可能匯入"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1498
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1394
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音效檔案 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1533
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音效標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1552
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1447
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "匯入圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1557
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1452
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
 msgid ""
@@ -12486,5 +12510,5 @@
 msgstr "發現下列問題："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #, java-format
 msgid ""
@@ -12494,57 +12518,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
 msgid "Auto Zoom"
 msgstr "自動縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
 msgid "Auto load tiles"
 msgstr "自動載入拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+msgid "Show Errors"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
 msgid "Load Tile"
 msgstr "載入拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
 msgid "Show Tile Info"
 msgstr "顯示拼貼資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
 msgid "Load All Tiles"
 msgstr "載入所有拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+msgid "Load All Error Tiles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
 msgid "Increase zoom"
 msgstr "增加縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
 msgid "Decrease zoom"
 msgstr "減少縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
 msgid "Snap to tile size"
 msgstr "貼緊拼貼大小"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:438
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
 msgid "Flush Tile Cache"
 msgstr "清除拼貼快取"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1247
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
 msgid "zoom in to load any tiles"
 msgstr "拉近以讀取任何拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
 msgid "zoom in to load more tiles"
 msgstr "拉近以讀取更多拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
 msgid "increase zoom level to see more detail"
 msgstr "增加縮放等級以查看更多詳細資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "No tiles at this zoom level"
 msgstr "這個縮放等級沒有拼貼"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1338
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -13078,15 +13110,15 @@
 msgstr "JPEG 圖片 (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
 msgstr "gps 標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -13094,26 +13126,26 @@
 msgstr[0] "{0} 由 {1} 標記組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
 msgstr "這個圖層中沒有既存的音效標記可位移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
 msgstr "顯示文字/圖示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:387
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
 msgstr "切換標記文字和圖示的可見性狀態。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
 msgid "Synchronize Audio"
 msgstr "同步音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "當您在聆聽同步隊列時需要暫停音效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -13121,14 +13153,14 @@
 msgstr "音效同步於點 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "在播放時無法於圖層同步。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
 msgstr "在播放開頭放置聲音標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -13153,13 +13185,13 @@
 msgstr "無法建立新的音效標記。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "嘗試顯示這個標記的 URL 時發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
 msgid "(URL was: "
 msgstr "(URL 是： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
 msgstr "在顯示 URL 時發生錯誤"
@@ -14137,82 +14169,82 @@
 msgstr "顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
 msgstr "繪出方向箭頭"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:74
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:67
 msgid "Only on the head of a way."
 msgstr "只在路徑的開頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
 msgstr "繪出單行道箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw segment order numbers"
 msgstr "繪製區段順序編號"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
 msgstr "繪出已下載資料的邊界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
 msgstr "在選擇模式繪出虛擬節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
 msgstr "將未使用的圖層以其他顏色繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑化地圖圖片（反鉅齒）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
 msgstr "只繪出區域的輪廓"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "GPS Points"
 msgstr "GPS 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
 msgstr "繪出路徑區段的方向提示。"
 
 #. draw oneway arrows
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr "繪出單行道和其他有方向的物件的方向箭頭。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
 msgstr "繪出所有區段在其路徑中的順序編號。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "繪出從伺服器下載資料的邊界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
 msgstr "將未使用的資料圖層以不同的顏色繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -14220,15 +14252,51 @@
 msgstr "這個選項會防止填滿區域，並且會覆蓋在選取樣式中指定的任何數值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
 msgid "OSM Data"
 msgstr "OSM 資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgid "Auto"
+msgstr "自動"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "名稱"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Everything"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Name or offset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
+msgid "None"
+msgstr "沒有"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+msgid "Custom"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:56
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1261
 msgid "Use global settings."
 msgstr "使用全域設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:41
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -14239,47 +14307,39 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
-msgid "None"
-msgstr "沒有"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
 msgstr "如果沒有匯入區段時強制繪出的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
 msgid "Draw large GPS points."
 msgstr "繪出大型 GPS 點。"
 
 #. hdopCircleGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
 msgstr "從 HDOP 數值繪製圓形。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速率（紅 = 慢，綠 = 快）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
 msgid "Single Color (can be customized for named layers)"
 msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -14287,5 +14347,5 @@
 #. <separator/>
 #. group "Car"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:1438
 msgid "Car"
@@ -14309,5 +14369,5 @@
 #. group "Bicycle"
 #. item "Public Transport/Subway Entrance" check "Bicycle"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:441 build/trans_presets.java:564
 #: build/trans_presets.java:843 build/trans_presets.java:862
@@ -14350,5 +14410,5 @@
 #. <space />
 #. item "Barriers/Sally Port" check "Foot"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
 #: build/trans_presets.java:437 build/trans_presets.java:563
 #: build/trans_presets.java:842 build/trans_presets.java:861
@@ -14362,38 +14422,18 @@
 msgstr "步行"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
 msgstr "讀取 GPX 時建立標記。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
 msgstr "快速繪製（看起來較醜）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgid "Auto"
-msgstr "自動"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
-msgctxt "gpx_field"
-msgid "Name"
-msgstr "名稱"
-
-#. gpx data field name
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgctxt "gpx_field"
-msgid "Desc(ription)"
-msgstr "描述"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:49
-msgid "Both"
-msgstr "兩者"
-
 #. makeAutoMarkers
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:91
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -14402,10 +14442,10 @@
 
 #. ensure that default is in data base
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 點之間繪出線條"
 
 #. drawRawGpsMaxLineLengthLocal
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:135
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -14413,35 +14453,35 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
 msgstr "本地端檔案最大長度（公尺）"
 
 #. drawRawGpsMaxLineLength
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:140
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
 msgstr "最大長度（公尺）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:145
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:159
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:163
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -14449,14 +14489,14 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:138
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（像素）"
 
 #. largeGpsPoints
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
 msgstr "將 GPS 點以較大的點繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -14464,13 +14504,13 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
 msgstr "依速度來為點和軌跡區段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -14478,27 +14518,45 @@
 msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。您的捕捉裝置需要能記錄這項資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
 msgstr ""
 
 #. color Tracks by Velocity Tune
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:205
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
 msgstr "軌跡與點的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:195
+#. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
+#. this only for global config
+#. waypointLabel
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
 msgstr "航點標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:197
-msgid "Global settings"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
+msgid "Audio waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#, java-format
+msgid "Incorrect waypoint label pattern: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+msgid "Incorrect pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
+#, java-format
+msgid "Incorrect audio waypoint label pattern: {0}"
 msgstr ""
 
@@ -15163,10 +15221,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
 msgid ""
-"JOSM will always listen at port 8111 on localhost.This port is not "
+"JOSM will always listen at port 8111 on localhost. This port is not "
 "configurable because it is referenced by external applications talking to "
 "JOSM."
 msgstr ""
-"JOSM 會聽取本機的連接埠 8111。這個連接埠是不能設定的，因為它是由外部與 JOSM "
-"溝通的應用程式所參照。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15255,5 +15311,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
 msgid "Reset"
 msgstr "重新設定"
@@ -15542,6 +15598,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
-msgid "Always update withouth asking"
-msgstr "永遠不詢問就更新"
+msgid "Always update without asking"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -15943,5 +15999,5 @@
 msgstr "新關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -15970,9 +16026,9 @@
 msgstr "搜尋預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
 msgstr "只顯示適合選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
 msgstr "搜尋標籤"
@@ -16254,7 +16310,7 @@
 #, java-format
 msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
-msgstr "解析 gpx 檔案 {0} 時發生錯誤。檔案將只有部分可以使用"
+"Error occurred while parsing gpx file {0}. Only a part of the file will be "
+"available."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -16577,6 +16633,6 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
-msgid "Prolog of OsmChange document not written yet. Please write frst."
-msgstr "OsmChange 文件的序言尚未寫入。請先進行寫入。"
+msgid "Prolog of OsmChange document not written yet. Please write first."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -16791,9 +16847,7 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',"
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-"元素「bounds」缺少必要的屬性。得到 minlon=''{0}'',minlat=''{1}'',"
-"maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
@@ -17185,4 +17239,9 @@
 msgstr "儲存使用者與密碼(未加密)"
 
+#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
+msgid ""
+"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18035,4 +18094,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
@@ -18158,4 +18219,18 @@
 msgstr "無法載入 XML schema。"
 
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
+#, java-format
+msgid "Unexpected token ({0}) on position {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
+#, java-format
+msgid "Unexpected token on position {0}. Expected {1}, found {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
+msgid "Error while parsing search expression"
+msgstr ""
+
 #. *
 #. This file can be used to add some special messages to the translation,
@@ -18729,6 +18804,6 @@
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
-msgid "Allows to filter out unnececary GPS tracks"
-msgstr "允許過濾掉不需要的 GPS 軌跡"
+msgid "Allows to filter out unnecessary GPS tracks"
+msgstr ""
 
 #. Plugin graphview
@@ -35049,4 +35124,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
+#. Lines starting with a # are considered as comments.
 #.
 #. Data type can be:
@@ -35063,6 +35139,6 @@
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
-#. ends with // signs. If an 'i' is appended, the regular expression is
-#. case insensitive.
+#. ends with a / sign. If an 'i' is appended, the regular expression is
+#. case insensitive. For instance, /foo|bar/i
 #.
 #. The * sign indicates any string.
@@ -35081,15 +35157,15 @@
 #. Empty lines and space signs are ignored
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
-#: build/trans_validator.java:38
+#: build/trans_validator.java:39
 msgid "abbreviated street name"
 msgstr "縮寫的街道名稱"
 
 #. node : W : oneway == *
-#: build/trans_validator.java:40
+#: build/trans_validator.java:41
 msgid "oneway tag on a node"
 msgstr "節點上有單行道標籤"
 
 #. node : W : bridge == BOOLEAN_TRUE
-#: build/trans_validator.java:41
+#: build/trans_validator.java:42
 msgid "bridge tag on a node"
 msgstr "節點上有橋樑標籤"
@@ -35100,12 +35176,12 @@
 #. node : W : highway == unclassified
 #. node : W : highway == track
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
-#: build/trans_validator.java:46
+#: build/trans_validator.java:43 build/trans_validator.java:44
+#: build/trans_validator.java:45 build/trans_validator.java:46
+#: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
 msgstr "節點上錯誤的公路標籤"
 
 #. way  : I : highway == unclassified && name != *
-#: build/trans_validator.java:47
+#: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
 msgstr "未命名未分類道路"
@@ -35114,16 +35190,16 @@
 #. way  : I : highway == tertiary && ref != *
 #. way  : I : highway == motorway && nat_ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
-#: build/trans_validator.java:50
+#: build/trans_validator.java:49 build/trans_validator.java:50
+#: build/trans_validator.java:51
 msgid "highway without a reference"
 msgstr "沒有編號參照的公路"
 
 #. *    : W : highway == road
-#: build/trans_validator.java:51
+#: build/trans_validator.java:52
 msgid "temporary highway type"
 msgstr "暫時性道路類型"
 
 #. *    : W : / *name
-#: build/trans_validator.java:52
+#: build/trans_validator.java:53
 msgid "misspelled key name"
 msgstr "拼錯的鍵名"
@@ -35133,10 +35209,10 @@
 #. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
-#: build/trans_validator.java:58
+#: build/trans_validator.java:59
 msgid "cycleway with tag bicycle"
 msgstr ""
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
-#: build/trans_validator.java:59
+#: build/trans_validator.java:60
 msgid "footway with tag foot"
 msgstr ""
@@ -35145,10 +35221,10 @@
 #. way  : I : highway == footway && foot == *                     # footway with tag foot
 #. way  : W : highway == cycleway && cycleway == lane
-#: build/trans_validator.java:62
+#: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
 msgstr ""
 
 #. way  : W : highway == * && barrier == *
-#: build/trans_validator.java:63
+#: build/trans_validator.java:64
 msgid "barrier used on a way"
 msgstr "用於路徑上的障礙物"
@@ -35157,35 +35233,44 @@
 #. way  : I : highway == footway && maxspeed == *
 #. way  : I : highway == steps && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:67 build/trans_validator.java:68
 msgid "maxspeed used for footway"
 msgstr ""
 
+#. way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *
+#: build/trans_validator.java:70
+msgid "oneway combined with *:backward/forward"
+msgstr ""
+
 #. *    : W : layer == /\+.
-#: build/trans_validator.java:69
+#: build/trans_validator.java:72
 msgid "layer tag with + sign"
 msgstr "有 + 號的圖層標籤"
 
 #. *    : I : name == /.*Strasse.
-#: build/trans_validator.java:71
+#: build/trans_validator.java:74
 msgid "street name contains ss"
 msgstr "街道名稱包含 ss"
 
 #. relation : E : type != *
-#: build/trans_validator.java:73
+#: build/trans_validator.java:76
 msgid "relation without type"
 msgstr "沒有類型的關係"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
-#: build/trans_validator.java:75
+#: build/trans_validator.java:78
 msgid "restaurant without name"
 msgstr "沒有名稱的餐廳"
 
 #. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : natural == water && waterway == *                   # unusual tag combination (natural=water & waterway)
 #. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:81
+msgid "unusual tag combination (highway & waterway)"
+msgstr ""
+
 #. *    : W : highway == * && natural == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
-msgid "unusual tag combination"
-msgstr "不常見的標籤組合"
+#: build/trans_validator.java:82
+msgid "unusual tag combination (highway & natural)"
+msgstr ""
 
 #. Reduced contents of http://josm.openstreetmap.de/wiki/Maps
@@ -35290,117 +35375,127 @@
 msgstr ""
 
+#. wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste
+#: build/trans_wms.java:22
+msgid "Geoimage.at (HighRes)"
+msgstr ""
+
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
-#: build/trans_wms.java:22
+#: build/trans_wms.java:23
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#: build/trans_wms.java:23
+#: build/trans_wms.java:24
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
-#: build/trans_wms.java:24
+#: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
 msgstr "捷克 CUZK:KM"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#: build/trans_wms.java:25
+#: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
 msgstr "捷克 UHUL:ORTOFOTO"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
-#: build/trans_wms.java:26
+#: build/trans_wms.java:27
 msgid "NPE Maps"
 msgstr "NPE Maps"
 
-#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
-#: build/trans_wms.java:27
+#. http://timsc.dev.openstreetmap.org/wms2/map.php?
+#: build/trans_wms.java:28
 msgid "NPE Maps (Tim)"
 msgstr "NPE Maps (Tim)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#: build/trans_wms.java:28
+#: build/trans_wms.java:29
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:29
+#: build/trans_wms.java:30
 msgid "MLIT Japan (ORTHO)"
 msgstr "MLIT 日本 (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:30
+#: build/trans_wms.java:31
 msgid "MLIT Japan (ORTHO01)"
 msgstr "MLIT 日本 (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:31
+#: build/trans_wms.java:32
 msgid "MLIT Japan (ORTHO02)"
 msgstr "MLIT 日本 (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#: build/trans_wms.java:32
+#: build/trans_wms.java:33
 msgid "MLIT Japan (ORTHO03)"
 msgstr "MLIT 日本 (ORTHO03)"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
-#: build/trans_wms.java:33
+#: build/trans_wms.java:34
 msgid "Lodi - Italy"
 msgstr ""
 
 #. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
-#: build/trans_wms.java:34
+#: build/trans_wms.java:35
 msgid "Sicily - Italy"
 msgstr ""
 
 #. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
-#: build/trans_wms.java:35
+#: build/trans_wms.java:36
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - 義大利"
 
 #. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
-#: build/trans_wms.java:36
+#: build/trans_wms.java:37
 msgid "SPOTMaps (France)"
 msgstr "SPOTMaps（法國）"
 
 #. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
-#: build/trans_wms.java:37
+#: build/trans_wms.java:38
 msgid "PNOA Spain"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
-#: build/trans_wms.java:38
+#: build/trans_wms.java:39
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
-#: build/trans_wms.java:39
+#: build/trans_wms.java:40
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
-#: build/trans_wms.java:40
+#: build/trans_wms.java:41
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2
-#: build/trans_wms.java:41
+#: build/trans_wms.java:42
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune
-#: build/trans_wms.java:42
+#: build/trans_wms.java:43
 msgid "Stevns (Denmark)"
 msgstr ""
 
-#. tms:http://dev.openstreetmap.org/~gravitystorm/imagery/philippines
-#: build/trans_wms.java:43
+#. tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines
+#: build/trans_wms.java:44
 msgid "Pangasinan (Phillipines HiRes)"
 msgstr ""
 
 #. scanex:irs;;;IRS
-#: build/trans_wms.java:44
+#: build/trans_wms.java:45
 msgid "ScanEx IRS"
+msgstr ""
+
+#. tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1
+#: build/trans_wms.java:46
+msgid "South Africa Topo (OOC)"
 msgstr ""
 
@@ -35645,6 +35740,6 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
-msgid "Upload cancelled"
-msgstr "上傳已取消"
+msgid "Upload canceled"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
@@ -35746,9 +35841,9 @@
 msgstr "(沒有海拔資料)"
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:55
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
 msgstr ""
@@ -35766,23 +35861,53 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:65
+#. I18n: Combobox to select what a press to return key does
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
+msgid "Enter key mode"
+msgstr ""
+
+#. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
+#. tr("Autosimplify and save"),tr("Simplify and wait"),tr("Simplify and save"),
+#. tr("Save as is")});
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
+msgid "Autosimplify"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Simplify with initial epsilon"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
+msgid "Save as is"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
+msgid "Snap to nodes"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
+msgid "Add fixed points on click"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
+msgid "Add fixed points on spacebar"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:71
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
-msgid ""
-"Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to "
-"tune simplification"
-msgstr ""
-
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
+msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
 msgid ""
 "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
@@ -35790,26 +35915,54 @@
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:85
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:87
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:284
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:450
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
+#, java-format
+msgid "Are you sure you do not want to save the line containing {0} points?"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
+#, java-format
+msgid ""
+"{0} m - length of the line\n"
+"{1} nodes\n"
+"{2} points per km (maximum)\n"
+"{3} points per km (average)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
+#, fuzzy
+msgid "Line information"
+msgstr "外掛程式資訊"
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:469
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:546
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#, java-format
+msgid "min distance={0} px ({1} m)"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+msgid "Convert way to FastDraw line"
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -35817,6 +35970,6 @@
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
-msgid "Fix adresses"
-msgstr "修正地址"
+msgid "Fix addresses"
+msgstr ""
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
@@ -35926,9 +36079,9 @@
 msgstr "顯示不完整的地址"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:216
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
 msgstr "項目"
 
-#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
+#: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
 msgstr "沒有項目"
@@ -36027,17 +36180,34 @@
 msgstr "選擇所有資料不完整的地址。"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:310
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "Default image projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
+msgid "JOSM''s current projection"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
+#, java-format
+msgid ""
+"No projection file (.prj) found.<br>You can choose the default image "
+"projection ({0}) or JOSM''s current editor projection ({1}) as original "
+"image projection.<br>(It can be changed later from the right click menu of "
+"the image layer.)"
+msgstr ""
+
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
 msgstr "圖層屬性"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
 msgstr "匯入圖片"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
 msgstr "匯入地理參照的圖片"
 
-#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
+#: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
 msgstr "在建立圖片圖層時發生錯誤： "
@@ -36712,31 +36882,35 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Auto sourcing"
 msgstr "自動來源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:258
-msgid ""
-"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
-"which is currently allocated for full-screen switch by default\n"
-"Would you like to restore F11 for grab action ?"
-msgstr ""
-"外掛程式 cadastre-fr 一般使用功能鍵 F11 為捷徑鍵\n"
-"但它目前是預設分配給全螢幕切換使用\n"
-"您是否想要回復以 F11 作為抓取動作？"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+msgid ""
+"Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"
+"which is currently allocated for full-screen switch by default.\n"
+"Would you like to restore F11 for grab action?"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
 msgstr "回復抓取捷徑鍵 F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:266
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM 已停止以便讓變更生效。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:372
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
+msgid ""
+"Please enable at least two WMS layers in the cadastre-fr plugin "
+"configuration.\n"
+"Layers ''Building'' and ''Parcel'' added by default."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
 #, java-format
 msgid ""
@@ -36859,7 +37033,7 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
 msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
-msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。"
+"Replace the original white background by the background color defined in "
+"JOSM preferences."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -37766,5 +37940,5 @@
 msgstr "加入 EGPX 圖層"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:659
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -37774,17 +37948,17 @@
 "軌跡，請看這裡："
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1257
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1256
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1262
 msgid "Draw lines between points for this layer."
 msgstr "在這個圖層的各點之間繪出線條。"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263
 msgid "Do not draw lines between points for this layer."
 msgstr "在這個圖層的各點之間不要繪出線條。"
 
-#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1278
+#: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
 msgstr "選擇線條繪製選項"
@@ -37936,5 +38110,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:107
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:152
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
 msgstr ""
@@ -37942,10 +38116,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:108
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:130
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:163
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:164
 #, java-format
 msgid ""
@@ -37954,5 +38128,5 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:133
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
 #, java-format
 msgid ""
@@ -37961,6 +38135,6 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:136
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:169
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:170
 #, java-format
 msgid ""
@@ -37969,9 +38143,9 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:166
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:210
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
@@ -38130,71 +38304,79 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:63
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:64
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:127
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:130
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:135
-msgid "Wxternal ruleset directory:"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:143
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
+msgid "External ruleset directory:"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:155
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:164
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
 msgstr "建立"
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:176
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:188
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:191
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:211
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:284
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
+msgid "Arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
+msgid "Arrowhead placement"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:341
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:342
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:359
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
 msgid ""
 "Really restore default bookmarks?\n"
@@ -38202,32 +38384,26 @@
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:361
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:378
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:391
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:304
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
+msgid "Choose arrowhead fill color"
+msgstr ""
+
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
 msgstr ""
 
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:309
+#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:246
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:291
-msgid "GraphView default node"
-msgstr ""
-
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:247
-#: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/GraphViewPreferences.java:292
-msgid "Graphview default segment"
 msgstr ""
 
@@ -38262,6 +38438,6 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
 msgid ""
-"Surface values must not contain any of the following characters: '','', "
-"'''{''',  '''}''', ''='', ''|''"
+"Surface values must not contain any of the following characters: '','', '' "
+"'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
 
@@ -38392,30 +38568,43 @@
 msgstr "正在匯入..."
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:61
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:63
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
 msgstr ""
 
+#. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
+#. boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+#. "scan_all_layers", Main.parent,
+#. tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
+#. tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
+#. if(!answer) return;
+#. }
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:88
+msgid ""
+"Move the mouse to show trackpoint info for current layer. Hold shift to "
+"highlight tracks"
+msgstr ""
+
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
+msgid "Hide this"
+msgstr ""
+
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
-msgid "Hide this"
-msgstr ""
-
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:41
 msgid "Hide this&older"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:104
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:106
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
 msgstr ""
 
-#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:109
+#: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
 msgstr ""
@@ -39108,5 +39297,5 @@
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
-"Depending on your Operating Stystem / Distribution, you may have to create a "
+"Depending on your Operating System / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
@@ -39123,5 +39312,5 @@
 
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from prefence file"
+msgid "Transfer to password manager and remove from preference file"
 msgstr ""
 
@@ -39855,17 +40044,17 @@
 msgstr "來自剪貼簿的新相片圖層"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
 msgstr "支援的圖片檔"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:81
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
 msgstr "來自檔案的新相片圖層..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:130
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
 msgstr "找不到地圖物件。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:136
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
 msgstr "PicLayer 無法載入或匯入圖片。"
@@ -39879,41 +40068,33 @@
 msgstr "剪貼簿資料不是圖片"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:77
-msgid "A calibration file associated to the picture file was found:"
-msgstr "找到關聯到圖片檔的校正檔案："
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:85
-#, java-format
-msgid ""
-"(set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files)"
-msgstr ""
-"(將偏好設定中的  \"{0}\"  設定為 yes/no/ask\n"
-"以控制校準檔案的自動載入)"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:87
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
+#, java-format
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:253
+#, java-format
+msgid ""
+"Set \"{0}\" to yes/no/ask in the preferences\n"
+"to control the autoloading of calibration files."
+msgstr ""
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
 msgstr "您想要套用它嗎？"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:88
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
 msgstr "是否載入校準檔案？"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
 msgstr "它將會自動套用。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:95
-msgid "Also, frow now on, cal files will always be loaded automatically."
-msgstr "同時，從現在起，cal 檔案都會自動載入。"
-
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:96
-#, java-format
-msgid ""
-"Set  \"{0}\"  to yes/no/ask in the preferences\n"
-"to control the autoloading of calibration files."
-msgstr ""
-"將偏好設定中的  \"{0}\"  設定為 yes/no/ask\n"
-"以控制校準檔案的自動載入"
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
+msgid ""
+"Also, from now on, calibration files will always be loaded automatically."
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
@@ -40534,6 +40715,6 @@
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
-msgid "Download referrers for the the chosen relation and its members"
-msgstr "下載選取關係及它的成員的參照"
+msgid "Download referrers for the chosen relation and its members."
+msgstr ""
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
@@ -41513,4 +41694,21 @@
 msgstr "建立新的簽署金鑰"
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
+msgid "No such lane."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
+msgid ""
+"<html>The number of lanes is not specified for one or more roads; please add "
+"missing lanes tags.</html>"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
+#, java-format
+msgid ""
+"<html>An error occurred while constructing the model. Please run the "
+"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
+msgstr ""
+
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
@@ -41735,7 +41933,8 @@
 "turn restriction editor:"
 msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
-msgstr[0] "這個轉彎限制參照到 {0} 已在這個轉彎限制編輯器之外被刪除："
+"This turn restriction refers to {0} objects which were deleted outside of "
+"this turn restriction editor:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -41983,6 +42182,6 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
-msgid "Open an editor for the selected turn restricion"
-msgstr "為選取的轉彎限制開啟編輯器"
+msgid "Open an editor for the selected turn restriction"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
@@ -42565,5 +42764,5 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
-msgid "Adjacent ways will be selected. Nodes wiil be deselected."
+msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
 
@@ -42954,2563 +43153,64 @@
 msgstr ""
 
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "不能從偏好設定取得投影系統。使用 EPSG:4326。"
-
-#~ msgid "Save and Exit"
-#~ msgstr "存檔後離開"
-
-#~ msgid "Enter the coordinates for the new node."
-#~ msgstr "輸入新節點的座標"
-
-#~ msgid "File could not be found."
-#~ msgstr "找不到檔案"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "合併，不管怎樣"
-
-#~ msgid "Solve Conflicts"
-#~ msgstr "解決衝突"
-
-#~ msgid "Email"
-#~ msgstr "電子郵件"
-
-#~ msgid "Open in Browser"
-#~ msgstr "在瀏覽器中打開"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM 線上說明"
-
-#~ msgid "Please select at least two nodes to merge."
-#~ msgstr "請至少選取兩個節點來合併"
-
-#~ msgid "Create a new map."
-#~ msgstr "建立新地圖"
-
-#~ msgid "Checksum errors: "
-#~ msgstr "Checksum 錯誤: "
-
-#~ msgid "NMEA import faliure!"
-#~ msgstr "NMEA 匯入失敗！"
-
-#~ msgid "Open a preferences page for global settings."
-#~ msgstr "開啟偏好全域設定設定頁面"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "無法重新命名檔案 \"{0}\"。"
-
-#~ msgid "An error occurred while saving."
-#~ msgstr "存檔時發生錯誤"
-
-#~ msgid "There are unsaved changes. Discard the changes and continue?"
-#~ msgstr "還有尚未儲存的變更。是否要放棄變更後繼續？"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "未儲存的變更"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "提示：部分變更來自上傳到伺服器的新資料。"
-
-#~ msgid "The projection could not be read from preferences. Using Mercartor"
-#~ msgstr "無法從偏好設定讀取專案。使用 Mercartor"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "節點中有部分(幾乎)在直線裡"
-
-#~ msgid "Use decimal degrees."
-#~ msgstr "使用十進位度數"
-
-#~ msgid "Negative values denote Western/Southern hemisphere."
-#~ msgstr "負數表示西半球/南半球"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "是否組合有不同關係成員的路徑？"
-
-#~ msgid "Enter values for all conflicts."
-#~ msgstr "輸入所有衝突項目的數值。"
-
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "所有的路徑都是空的"
+#~ "List of merged elements. They will replace the my elements when the merge "
+#~ "decisions are applied."
+#~ msgstr "合併元件的清單。它們會在合併決定被接受時取代我的元件。"
+
+#~ msgid "Keep my coordiates"
+#~ msgstr "保留我的坐標"
+
+#~ msgid "Keep their coordiates"
+#~ msgstr "保留他們的坐標"
+
+#~ msgid "Change values?"
+#~ msgstr "是否改變數值？"
+
+#~ msgid "Upload cancelled"
+#~ msgstr "上傳已取消"
 
 #~ msgid ""
-#~ "Please select exactly three nodes or one way with exactly three nodes."
-#~ msgstr "請準確的選擇三個節點或是一個只有三個節點的路徑。"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "請選擇至少一項要下載的工作"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "只能在 JOSM 線上求助中編輯求助頁面"
-
-#~ msgid "gps track description"
-#~ msgstr "gps 軌跡描述"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "載入頁面 {0} 時發生錯誤"
-
-#~ msgid "History of Element"
-#~ msgstr "元件歷史"
-
-#~ msgid "Display history information about OSM ways or nodes."
-#~ msgstr "顯示 OSM 路徑或節點的歷史資訊。"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr "求助頁面遺失。以 <A HREF=\"{0}\">english</A> 建立它。"
+#~ "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+#~ "which is currently allocated for full-screen switch by default\n"
+#~ "Would you like to restore F11 for grab action ?"
+#~ msgstr ""
+#~ "外掛程式 cadastre-fr 一般使用功能鍵 F11 為捷徑鍵\n"
+#~ "但它目前是預設分配給全螢幕切換使用\n"
+#~ "您是否想要回復以 F11 作為抓取動作？"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "Replace the original white background by the backgound color defined in "
+#~ "JOSM preferences."
+#~ msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。"
+
+#~ msgid ""
+#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
+#~ msgstr "忽略的例外，因為下載已被取消。例外為：{0}"
+
+#~ msgid ""
+#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
+#~ "to default: {0}"
+#~ msgstr "警告：初始化偏好設定失敗。無法將偏好設定重設為預設值：{0}"
+
+#~ msgid ""
+#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+#~ msgstr "警告：在修訂版檔案中有未預期的 JOSM 版本號碼，數值為「{0}」"
+
+#~ msgid ""
+#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
+#~ "load NTF<->RGF93 grid"
 #~ msgstr ""
-#~ "求助頁面遺失。以 <A HREF=\"{0}\">english</A> 或 <A HREF=\"{1}\">您的語言</"
-#~ "A>建立它。"
+#~ "警告：無法開啟資源「/data/{0}」的輸入串流。不能載入 NTF<->RGF93 格線"
 
 #~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr "請選擇至少一個節點、路徑或關係。只有已上傳的元件會有歷史紀錄。"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "強制合併"
-
-#~ msgid "Those nodes are not in a circle."
-#~ msgstr "那些節點不在一個圓上。"
+#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "警告：忽略例外，因為工作已取消。例外：{0}"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "是否合併有不同成員的節點？"
-
-#~ msgid "Cannot merge nodes: Would have to delete a way that is still used."
-#~ msgstr "不能合併節點。會刪除仍在使用的路徑。"
-
-#~ msgid "Selection must consist only of ways."
-#~ msgstr "選擇區域只能由路徑組成。"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "只允許兩個節點"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degree"
-#~ msgstr "移動節點讓所有角度成為 90 或 270 度"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "請選擇一或多個至少有四個節點的封閉路徑。"
-
-#~ msgid "Only one node selected"
-#~ msgstr "只選取一個節點"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "請選擇有近乎正確角度的路徑來做直角化。"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "尚未開啟文件故沒有可儲存的項目。"
+#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+#~ msgstr "警告：因為工作已取消，忽略例外。例外為：{0}"
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr "內部的錯誤：不能檢查無圖層的條件。請將它回報為程式錯誤。"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "不明的延伸檔名。"
-
-#~ msgid "An error occurred while restoring backup file."
-#~ msgstr "在還原備份檔案時發生錯誤。"
-
-#~ msgid "Could not back up file."
-#~ msgstr "無法備份檔案。"
-
-#~ msgid ""
-#~ "A role based relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr "以角色為基礎的關係成員已複製到所有新的路徑。"
-
-#~ msgid "None of this way's nodes are glued to anything else."
-#~ msgstr "這個路徑的節點沒有一個黏合到其他項目上。"
-
-#~ msgid "Undeleting Way..."
-#~ msgstr "取消刪除路徑..."
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr "找不到要更新的資料。您是否已經開啟或下載過資料圖層？"
-
-#~ msgid "Updates the current data layer from the server (re-downloads data)"
-#~ msgstr "從伺服器更新目前的資料圖層（重新下載資料）"
-
-#~ msgid "Update Data"
-#~ msgstr "更新資料"
-
-#~ msgid "Yes, undelete them too"
-#~ msgstr "是的，也取消它們的刪除"
-
-#~ msgid "No, cancel operation"
-#~ msgstr "不，取消操作"
-
-#~ msgid ""
-#~ "<html>There are {0} additional nodes used by way {1}<br>which are deleted "
-#~ "on the server.<br><br>Do you want to undelete these nodes too?</html>"
-#~ msgstr ""
-#~ "<html>還有 {0} 個額外的節點也是用於這條在伺服器上<br>已刪除的路徑 {1}。"
-#~ "<br><br>是否要一併取消這些節點的刪除？</html>"
-
-#~ msgid "Undelete additional nodes?"
-#~ msgstr "取消刪除額外的節點？"
-
-#~ msgid "Update Selection"
-#~ msgstr "更新選擇區域"
-
-#~ msgid "Update failed"
-#~ msgstr "更新失敗"
-
-#~ msgid "unexpected return value. Got {0}"
-#~ msgstr "未預期的回傳值。得到 {0}"
-
-#~ msgid "Selection too big"
-#~ msgstr "選擇區域太大"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "上傳至 OSM..."
-
-#~ msgid "Upload all changes to the OSM server."
-#~ msgstr "將所有的變更上傳至 OSM 伺服器。"
-
-#~ msgid "Upload these changes?"
-#~ msgstr "是否上傳這些變更？"
-
-#~ msgid "There are unresolved conflicts. You have to resolve these first."
-#~ msgstr "尚有未解決的衝突。您必須先解決那些衝突。"
-
-#~ msgid "Uploading"
-#~ msgstr "正在上傳"
-
-#~ msgid "Synchronize {0} {1} only"
-#~ msgstr "只同步 {0} {1}"
-
-#~ msgid "Conflict detected"
-#~ msgstr "偵測到衝突"
-
-#~ msgid "Checking whether node {0} is gone ..."
-#~ msgstr "檢查節點 {0} 是否消失..."
-
-#~ msgid "Undeleting relation..."
-#~ msgstr "取消刪除關係..."
-
-#~ msgid "Keep mine"
-#~ msgstr "保留我的"
-
-#~ msgid "Delete mine"
-#~ msgstr "刪除我的"
-
-#~ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-#~ msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "上傳至 OSM API 失敗"
-
-#~ msgid ""
-#~ "Failed to initialize communication with the OSM server {0}.\n"
-#~ "Check the server URL in your preferences and your internet connection."
-#~ msgstr ""
-#~ "初始化與 OSM 伺服器 {0} 的連線失敗。\n"
-#~ "請檢查您的偏好設定中的伺服器 URL 和網際網路連線。"
-
-#~ msgid "Faster Forward"
-#~ msgstr "加速快轉"
-
-#~ msgid "Jump back."
-#~ msgstr "跳回"
-
-#~ msgid "Previous Marker"
-#~ msgstr "前個標記"
-
-#~ msgid "Play next marker."
-#~ msgstr "播放下一個標記。"
-
-#~ msgid "Next Marker"
-#~ msgstr "下個標記"
-
-#~ msgid "Play previous marker."
-#~ msgstr "播放前一個標記。"
-
-#~ msgid "Slower Forward"
-#~ msgstr "慢速快轉"
-
-#~ msgid "No data imported."
-#~ msgstr "沒有匯入資料。"
-
-#~ msgid "Errors during Download"
-#~ msgstr "下載時發生錯誤"
-
-#~ msgid "Data Layer"
-#~ msgstr "資料圖層"
-
-#~ msgid "The following errors occurred during mass download:"
-#~ msgstr "在大量下載時發生下列錯誤："
-
-#~ msgid ""
-#~ "Click to delete. Shift: delete way segment. Alt: don't delete unused "
-#~ "nodes when deleting a way. Ctrl: delete referring objects."
-#~ msgstr ""
-#~ "點選可進行刪除。Shift：刪除路徑區段。Alt：刪除路徑時不要刪除未使用的節點。"
-#~ "Ctrl：刪除參考的物件。"
-
-#~ msgid "Drag a way segment to make a rectangle."
-#~ msgstr "拖曳路徑區段以產生矩形。"
-
-#~ msgid "Select, move and rotate objects"
-#~ msgstr "選擇、移動和旋轉物件"
-
-#~ msgid ""
-#~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); "
-#~ "Shift-Ctrl to rotate selected; or change selection"
-#~ msgstr ""
-#~ "以拖曳移動物件；按 Shift 加入選擇區域(Ctrl 可切換)；Shift-Ctrl 會旋轉選取"
-#~ "的；或改變選擇區域"
-
-#~ msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-#~ msgstr "<b>name:Bak</b> - 「Bak」出現在名稱中的任何地方。"
-
-#~ msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-#~ msgstr "<b>-name:Bak</b> - 名稱中沒有「Bak」。"
-
-#~ msgid "<b>id:</b>... - object with given ID"
-#~ msgstr "<b>id：</b>... - 具有此 ID 的物件"
-
-#~ msgid "<b>nodes:</b>... - object with given number of nodes"
-#~ msgstr "<b>節點數：</b>... - 含有此數目節點的物件"
-
-#~ msgid "CI"
-#~ msgstr "CI"
-
-#~ msgid "RX"
-#~ msgstr "RX"
-
-#~ msgid "Missing arguments for or."
-#~ msgstr "沒有 or 所需的引數。"
-
-#~ msgid "CS"
-#~ msgstr "CS"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "需要關閉括弧。"
-
-#~ msgid "Missing argument for not."
-#~ msgstr "沒有 not 所需的引數。"
-
-#~ msgid "Please enter a search string."
-#~ msgstr "請輸入搜尋字串。"
-
-#~ msgid "Change"
-#~ msgstr "改變"
-
-#~ msgid "Remove \"{0}\" for {1} {2}"
-#~ msgstr "從 {1} {2} 移除「{0}」"
-
-#~ msgid "Error while communicating with server."
-#~ msgstr "與伺服器連線時發生錯誤。"
-
-#~ msgid "Set {0}={1} for {2} ''{3}''"
-#~ msgstr "將 {2}「{3}」設定 {0}={1}"
-
-#~ msgid "Remove \"{0}\" for {1} ''{2}''"
-#~ msgstr "從 {1} 「{2}」移除「{0}」"
-
-#~ msgid "Downloading..."
-#~ msgstr "正在下載..."
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "URL 解析錯誤：「{0}」"
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "無法讀取 URL：「{0}」"
-
-#~ msgid "ChangeRelationMemberRole"
-#~ msgstr "改變關係成員角色"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "選擇區域「{0}」已用於關係「{1}」的角色 {2}。\n"
-#~ "是否自關係中刪除？"
-
-#~ msgid "Set {0}={1} for {2} {3}"
-#~ msgstr "將 {2} {3} 設定 {0}={1}"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "解決 {1} 個物件中的 {0} 個衝突"
-
-#~ msgid "cannot resolve undecided conflict"
-#~ msgstr "不能未決定的衝突"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "刪除 {1} {0}"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "衝突的關係"
-
-#~ msgid "Delete {0} {1}"
-#~ msgstr "刪除 {0} {1}"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒"
-#~ "有看到的）可能會使用它們。<br>確定要刪除嗎？"
-
-#~ msgid ""
-#~ "Warning: Purging way {0} because number of nodes dropped below 2. Current "
-#~ "is {1}"
-#~ msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}"
-
-#~ msgid "RemoveRelationMember"
-#~ msgstr "移除關係成員"
-
-#~ msgid "Move"
-#~ msgstr "移動"
-
-#~ msgid ""
-#~ "Selection \"{0}\" is used by relation \"{1}\".\n"
-#~ "Delete from relation?"
-#~ msgstr ""
-#~ "選擇區域「{0}」已用於關係「{1}」。\n"
-#~ "是否自關係中刪除？"
-
-#~ msgid "Split way segment"
-#~ msgstr "分割路徑區段"
-
-#~ msgid "Rotate"
-#~ msgstr "旋轉"
-
-#~ msgid "Resolve {0} tag conflicts in {1} {2}"
-#~ msgstr "解決 {1} {2} 中的 {0} 標籤衝突"
-
-#~ msgid "Resolve conflicts in node list of of way {0}"
-#~ msgstr "解決路徑 {0} 的節點清單衝突"
-
-#~ msgid "Resolve version conflicts for {0} {1}"
-#~ msgstr "解決 {0} {1} 的版本衝突"
-
-#~ msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-#~ msgstr "<b>Baker Street</b> - 「Baker」和「Street」出現在何設定鍵或名稱中。"
-
-#~ msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-#~ msgstr "<b>\"Baker Street\"</b> -  「Baker Street」出現在何設定鍵或名稱中。"
-
-#~ msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-#~ msgstr "<b>type=route</b> - 含有設定鍵「type」為「route」者。"
-
-#~ msgid ""
-#~ "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-#~ "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-#~ msgstr ""
-#~ "<b>type=*</b> - 設定鍵「type」為任何數值。也可以使用 <b>*=value</b>、"
-#~ "<b>type=</b>、<b>*=*</b>、<b>*=</b>"
-
-#~ msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-#~ msgstr "使用 <b>\"</b> 將運算子包覆 (例如當設定鍵含有 :)"
-
-#~ msgid "Wrong number of parameters for nodes operator."
-#~ msgstr "給 nodes 運算子錯誤的參數數量。"
-
-#~ msgid ""
-#~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-#~ "nodes or range, for example nodes:10-20"
-#~ msgstr ""
-#~ "nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 "
-#~ "nodes:10-20"
-
-#~ msgid "Incorrect value of id operator: {0}. Number is expected."
-#~ msgstr "id 運算子數值錯誤：{0}。應使用數字。"
-
-#~ msgid "Preferences file had errors. Making backup of old one to {0}."
-#~ msgstr "偏好設定檔案有錯誤。將舊檔案備份到 {0}。"
-
-#~ msgid "true"
-#~ msgstr "true"
-
-#~ msgid "false"
-#~ msgstr "false"
-
-#~ msgid "position"
-#~ msgstr "位置"
-
-#~ msgid "S"
-#~ msgstr "南"
-
-#~ msgid "N"
-#~ msgstr "北"
-
-#~ msgid "W"
-#~ msgstr "西"
-
-#~ msgid "E"
-#~ msgstr "東"
-
-#~ msgid "changeset"
-#~ msgstr "變更組合"
-
-#~ msgid "changesets"
-#~ msgstr "變更組合"
-
-#~ msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
-#~ msgstr "參數「{0}」不是有效的類型名稱，取得「{1}」"
-
-#~ msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-#~ msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history"
-#~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
-
-#~ msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-#~ msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
-
-#~ msgid "no earliest version found. History is empty."
-#~ msgstr "找不到最早的版本。歷史紀錄是空的。"
-
-#~ msgid "no latest version found. History is empty."
-#~ msgstr "找不到最新的版本。歷史紀錄是空的。"
-
-#~ msgid "parameter {0} not in range 0..{1}, got {2}"
-#~ msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "區域類型的路徑並未封閉。"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "多邊形路徑「{0}」並未封閉。"
-
-#~ msgid "Way ''{0}'' with less than two points."
-#~ msgstr "路徑「{0}」少於兩個節點。"
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "找到一個以上「從」路徑。"
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "找到一個以上「到」路徑。"
-
-#~ msgid "No \"via\" node or way found."
-#~ msgstr "找到一個以上「經過」路徑。"
-
-#~ msgid "The \"from\" way doesn't start or end at a \"via\" node."
-#~ msgstr "「從」路徑沒有開始或結束於「經過」節點。"
-
-#~ msgid "The \"to\" way doesn't start or end at a \"via\" node."
-#~ msgstr "「到」路徑沒有開始或結束於「經過」節點。"
-
-#~ msgid "The \"from\" way doesn't start or end at the \"via\" way."
-#~ msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
-
-#~ msgid "The \"to\" way doesn't start or end at the \"via\" way."
-#~ msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "路徑「{1}」沒有有用的角色「{0}」。"
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "多邊形中有非-路徑「{0}」。"
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "多邊形「{0}」沒有外部路徑。"
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "內部路徑「{0}」在外。"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "內部路徑「{0}」的樣式等同多邊形。"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "外部路徑「{0}」的樣式不符。"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid ""
-#~ "IMPORTANT : data positioned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, save your work\n"
-#~ "and start a new layer on the new zone."
-#~ msgstr ""
-#~ "重要：資料的位置已遠遠偏離目前\n"
-#~ "Lambert zone 的限制。\n"
-#~ "看到此訊息後不要上傳任何資料。\n"
-#~ "復原您最後的動作，儲存您的成果\n"
-#~ "並在新的區域開啟新的圖層。"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} 個物件有衝突："
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "開啟檔案(若為 .gpx 則是原始 gps)"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "參數是以它們被指定的順序讀取，因此請確定您在使用\n"
-#~ "--selection 前載入某些資料"
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "要取代 --download=<bbox> 可以指定 osm://<bbox>\n"
-
-#~ msgid "Full Screen"
-#~ msgstr "全螢幕"
-
-#~ msgid "File not found"
-#~ msgstr "找不到檔案"
-
-#~ msgid "{0} pending tag conflicts to be resolved"
-#~ msgstr "{0} 個標籤衝突待解決"
-
-#~ msgid "parameter current out of range: got {0}"
-#~ msgstr "參數目前超出範圍：得到 {0}"
-
-#~ msgid "unexpected value of parameter \"index\". Got {0}"
-#~ msgstr "參數「index」有未預期的數值。得到 {0}"
-
-#~ msgid "Copy my selected elements to the end of the list of merged elements"
-#~ msgstr "將我選取的元件複製到合併元件清單的結尾"
-
-#~ msgid ""
-#~ "Copy my selected elements before the first selected element in the list "
-#~ "of merged elements"
-#~ msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之前"
-
-#~ msgid ""
-#~ "Copy my selected elements after the first selected element in the list of "
-#~ "merged elements"
-#~ msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之後"
-
-#~ msgid ""
-#~ "Copy their selected element to the start of the list of merged elements"
-#~ msgstr "將他們選取的元件複製到合併元件清單的開頭"
-
-#~ msgid ""
-#~ "Copy their selected elements to the end of the list of merged elements"
-#~ msgstr "將他們選取的元件複製到合併元件清單的結尾"
-
-#~ msgid ""
-#~ "Copy their selected elements before the first selected element in the "
-#~ "list of merged elements"
-#~ msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之前"
-
-#~ msgid "Move up the selected elements by one position"
-#~ msgstr "將選取的元件向上移動一個位置"
-
-#~ msgid "Move down the selected entries by one position"
-#~ msgstr "將選取的項目向下移動一個位置"
-
-#~ msgid "Remove the selected entries from the list of merged elements"
-#~ msgstr "從合併元件的清單移除選取的項目"
-
-#~ msgid "Freeze the current list of merged elements"
-#~ msgstr "凍結合併元件目前的清單"
-
-#~ msgid "Unfreeze the list of merged elements and start merging"
-#~ msgstr "將合併元件的清單解除凍結並開始合併"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to start merging my and their entries</"
-#~ "html>"
-#~ msgstr "<html>點選 <strong>{0}</strong> 開始合併我和他們的項目</html>"
-
-#~ msgid ""
-#~ "<html>Click <strong>{0}</strong> to finish merging my and their entries</"
-#~ "html>"
-#~ msgstr "<html>點選 <strong>{0}</strong> 結束合併我和他們的項目</html>"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr "合併的節點尚未凍結。不能建置決議指令"
-
-#~ msgid "merged nodes not frozen yet. Can't build resolution command"
-#~ msgstr "合併的節點尚未凍結。不能建置決議指令"
-
-#~ msgid "cannot apply undecided tag merge item"
-#~ msgstr "不能接受未決定的標籤合併項目"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}"
-#~ msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "正在合併衝突。"
-
-#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
-#~ msgstr "警告：偏好設定 conflict.resolution 未預期的數值，得到 "
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "衝突： {0}"
-
-#~ msgid ""
-#~ "<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-#~ "strong> to apply already resolved conflicts anyway.<br>You can resolve "
-#~ "the remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-#~ "resolving conflicts.</html>"
-#~ msgstr ""
-#~ "<html>您並未完全解決所有的衝突。<br>點選 <strong>{0}</strong> 強制接受已解"
-#~ "決的衝突。<br>您可以稍後解決剩下的衝突。<br>點選 <strong>{1}</strong> 返回"
-#~ "以解決衝突。</html>"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr "將所有目前選取物件的狀態還原至歷史紀錄中選取的版本。"
-
-#~ msgid "There are unsaved changes. Delete the layer anwyay?"
-#~ msgstr "還有未儲存的變更。是否強制刪除圖層？"
-
-#~ msgid "Do you really want to delete the whole layer?"
-#~ msgstr "確定要刪除整個圖層？"
-
-#~ msgid "Show/Hide Text/Icons"
-#~ msgstr "顯示/隱藏文字/圖示"
-
-#~ msgid "Merge the layer directly below into the selected layer."
-#~ msgstr "將下列圖層直接合併至選取的圖層。"
-
-#~ msgid "Layers: {0}"
-#~ msgstr "圖層：{0}"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "標籤 (數值留空會刪除該標籤)"
-
-#~ msgid "Move Up"
-#~ msgstr "上移"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "將所有目前選取的物件加入為成員"
-
-#~ msgid "Remove all currently selected objects from relation"
-#~ msgstr "將所有目前選取的物件從關係中移除"
-
-#~ msgid "Move Down"
-#~ msgstr "下移"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "將目前表格列中的成員自這個關係中移除"
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "下載關係中所有不完整的路徑和節點"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "匯入時有衝突項目。"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "不能從伺服器讀取位置搜尋結果"
-
-#~ msgid "name"
-#~ msgstr "名稱"
-
-#~ msgid "near"
-#~ msgstr "靠近"
-
-#~ msgid "zoom"
-#~ msgstr "縮放"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "找不到具可讀時刻戳記的圖片。"
-
-#~ msgid "Image with path {0} does not exist or is not readable."
-#~ msgstr "路徑為 {0} 的圖片不存在或無法讀取。"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "圖片"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "檔案「{0}」的日期無法解析。"
-
-#~ msgid "Anonymous"
-#~ msgstr "匿名"
-
-#~ msgid "Enter Password"
-#~ msgstr "輸入密碼"
-
-#~ msgid "Login"
-#~ msgstr "登入"
-
-#~ msgid "Public"
-#~ msgstr "公開"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS 單元時區 (不同於照片)"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "與 GPS 單元同步時刻"
-
-#~ msgid "point"
-#~ msgid_plural "points"
-#~ msgstr[0] "點"
-
-#~ msgid "a track with {0} point"
-#~ msgid_plural "a track with {0} points"
-#~ msgstr[0] "有 {0} 個點的軌跡"
-
-#~ msgid "{0} consists of {1} track"
-#~ msgid_plural "{0} consists of {1} tracks"
-#~ msgstr[0] "{0} 由 {1} 軌跡組成"
-
-#~ msgid "{0} point"
-#~ msgid_plural "{0} points"
-#~ msgstr[0] "{0} 點"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "讀取 GPX 時建立非音效標記。"
-
-#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
-#~ msgstr "只有重要的方向提示（例如單行道標籤）。"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
-#~ "draw all lines."
-#~ msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
-
-#~ msgid ""
-#~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
-#~ msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
-
-#~ msgid ""
-#~ "Don't draw arrows if they are not at least this distance away from the "
-#~ "last one."
-#~ msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
-
-#~ msgid ""
-#~ "Colors points and track segments by dilution of position (HDOP). Your "
-#~ "capture device needs to logs that information."
-#~ msgstr ""
-#~ "依位置準確誤差 (HDOP) 來為點和軌跡區段上色。您的記錄裝置必須能記錄該項資"
-#~ "訊。"
-
-#~ msgid "Aborting..."
-#~ msgstr "正在中止..."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "連接 {0}..."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "不能開啓偏好設定目錄：{0}"
-
-#~ msgid "Don't apply changes"
-#~ msgstr "不要套用變更"
-
-#~ msgid "parameter {0} > 0 required. Got {1}."
-#~ msgstr "參數 {0} 必須 > 0 。得到 {1}。"
-
-#~ msgid "Error: {0}"
-#~ msgstr "錯誤：{0}"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "關係中已刪除的成員「{0}」。"
-
-#~ msgid "Empty member in relation."
-#~ msgstr "關係中的成員是空的。"
-
-#~ msgid "parameter ''{0}'' must not be null"
-#~ msgstr "參數「{0}」必須不為空值(null)"
-
-#~ msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-#~ msgstr "參數「{0}」應為 > 0，得到「{1}」"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "警告：{0}"
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "找不到「從」路徑。"
-
-#~ msgid "More than one \"via\" found."
-#~ msgstr "找到一個以上的「經過」。"
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "找不到「到」路徑。"
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "不明的角色「{0}」。"
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "「{0}」的不明成員類型。"
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "路徑「{0}」和「{1}」之間的十字路。"
-
-#~ msgid "Could not write bookmark."
-#~ msgstr "無法寫入書籤。"
-
-#~ msgid "Could not read bookmarks."
-#~ msgstr "無法讀取書籤。"
-
-#~ msgid "- running version is {0}"
-#~ msgstr "- 執行的版本是 {0}"
-
-#~ msgid "Lambert Zone (France)"
-#~ msgstr "Lambert Zone (法國)"
-
-#~ msgid "Set the language."
-#~ msgstr "設定語言。"
-
-#~ msgid "Activating updated plugins"
-#~ msgstr "使用更新後的外掛程式"
-
-#~ msgid "Toggle Full Screen view"
-#~ msgstr "切換全螢幕檢視"
-
-#~ msgid "Tags({0} conflicts)"
-#~ msgstr "標籤({0} 衝突)"
-
-#~ msgid "parameter '{0}' must not be null"
-#~ msgstr "參數「{0}」不能為空值(null)"
-
-#~ msgid "item {0} not found in list"
-#~ msgstr "在清單中找不到項目 {0}"
-
-#~ msgid "unexpected column index. Got {0}"
-#~ msgstr "未預期的欄位索引。得到 {0}"
-
-#~ msgid "adjustable {0} not registered yet"
-#~ msgstr "可調整的 {0} 尚未註冊"
-
-#~ msgid "layer not in list."
-#~ msgstr "圖層不在清單中。"
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "找不到限制 {0} 的樣式"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "按下重新載入來重新整理清單"
-
-#~ msgid "Apply partial resolutions"
-#~ msgstr "套用部分解決方案"
-
-#~ msgid "Command Stack: {0}"
-#~ msgstr "指令堆疊：{0}"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "尚未實作。"
-
-#~ msgid "An empty value deletes the key."
-#~ msgstr "空白的數值會刪除該設定鍵。"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "刪除選取的圖層。"
-
-#~ msgid "Delete Layer"
-#~ msgstr "刪除圖層"
-
-#~ msgid "Edit Properties"
-#~ msgstr "編輯屬性"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "作者：{0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "重新整理選擇區域清單。"
-
-#~ msgid "linked"
-#~ msgstr "已連結"
-
-#~ msgid "Occupied By"
-#~ msgstr "被此佔據："
-
-#~ msgid "Members: {0}"
-#~ msgstr "成員：{0}"
-
-#~ msgid "Remove Selected"
-#~ msgstr "移陳選取的"
-
-#~ msgid "Add Selected"
-#~ msgstr "加入選取的"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "關係編輯器：{0}"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "不能連線至伺服器。"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "解析伺服器回應時發生錯誤。"
-
-#~ msgid "Error when communicating with server."
-#~ msgstr "與伺服器連線時發生錯誤。"
-
-#~ msgid "Edit new relation"
-#~ msgstr "編輯新的關係"
-
-#~ msgid "Create new relation"
-#~ msgstr "建立新的關係"
-
-#~ msgid "Edit relation #{0}"
-#~ msgstr "編輯關係 #{0}"
-
-#~ msgid "Please enter a name for the location."
-#~ msgstr "請輸入此位置的名稱。"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "請先輸入想要的坐標。"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "先選擇一個書籤。"
-
-#~ msgid "Data Sources and Types"
-#~ msgstr "資料來源和類型"
-
-#~ msgid "Download Area"
-#~ msgstr "下載區域"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "請輸入搜尋字串"
-
-#~ msgid "to"
-#~ msgstr "到"
-
-#~ msgid "y from"
-#~ msgstr "y 軸"
-
-#~ msgid "x from"
-#~ msgstr "x 軸"
-
-#~ msgid "zoom level"
-#~ msgstr "縮放等級"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "點 {0} x {1} 沒有時刻"
-
-#~ msgid "Images for {0}"
-#~ msgstr "{0} 的圖片"
-
-#~ msgid "Read GPX..."
-#~ msgstr "讀取 GPX..."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS 開始：{0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS 結束：{0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "時區差異： "
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "輸入的時刻無法解析。"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} 在此軌跡中。"
-
-#~ msgid "Sync clock"
-#~ msgstr "同步時鐘"
-
-#~ msgid "Length: "
-#~ msgstr "長度： "
-
-#~ msgid " ({0} deleted.)"
-#~ msgstr " ({0} 已刪除。)"
-
-#~ msgid "Keep backup files"
-#~ msgstr "保留備份檔案"
-
-#~ msgid "Configure Sites..."
-#~ msgstr "設定網站..."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
-
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "OSM 帳號的登入名稱 (e-mail)。"
-
-#~ msgid "Proxy server host"
-#~ msgstr "代理伺服器主機"
-
-#~ msgid "Proxy Settings"
-#~ msgstr "代理伺服器設定值"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "啟用代理伺服器"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "OSM 伺服器 (REST API) 的基礎 URL"
-
-#~ msgid "Proxy server port"
-#~ msgstr "代理伺服器連接埠"
-
-#~ msgid "Proxy server username"
-#~ msgstr "代理伺服器使用者名稱"
-
-#~ msgid "Proxy server password"
-#~ msgstr "代理伺服器密碼"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM 使用者名稱 (e-mail)"
-
-#~ msgid "OSM password"
-#~ msgstr "OSM 密碼"
-
-#~ msgid "Base Server URL"
-#~ msgstr "基礎伺服器 URL"
-
-#~ msgid "Enable built-in defaults"
-#~ msgstr "啟用內建預設值"
-
-#~ msgid "The projection could not be read from preferences. Using Mercator"
-#~ msgstr "無法從偏好設定讀取投影資訊。使用麥卡托投影"
-
-#~ msgid ""
-#~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
-#~ "undesirable results when doing rectangular alignments.<br>Change your "
-#~ "projection to get rid of this warning.<br>Do you want to continue?"
-#~ msgstr ""
-#~ "<html>您所使用的 EPSG:4326 投影法在進行矩形對齊時<br>可能會造成不想要的結"
-#~ "果。<br>請改變您的投影法以避開這個警告。<br>是否要繼續？"
-
-#~ msgid "Jump forward"
-#~ msgstr "高速快轉"
-
-#~ msgid "Load Selection"
-#~ msgstr "載入選擇區域"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a French WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "投影法「{0}」只設計用於\n"
-#~ "緯度 46.1° 到 57° 之間。\n"
-#~ "如果您不是使用法國 WMS 伺服器，\n"
-#~ "請使用別種投影系統。\n"
-#~ "看到此訊息後請勿上傳任何資料。"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 45.7° and 47.9°\n"
-#~ "and longitutes between 5.7° and 10.6° only.\n"
-#~ "Use another projection system if you are not working\n"
-#~ "on a data set of Switzerland or Liechtenstein.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "投影法「{0}」只設計用於\n"
-#~ "緯度 45.7° 到 47.9° 和\n"
-#~ "經度 5.7° 到 10.6° 之間。\n"
-#~ "如果您不是在製作瑞士或列支敦斯登的資料，\n"
-#~ "請使用別種投影系統。\n"
-#~ "看到此訊息後請勿上傳任何資料。"
-
-#~ msgid "Error while parsing"
-#~ msgstr "分析時發生錯誤"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "標籤預設組合來源"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "標籤預設組合定義檔案的來源（URL 或檔案名稱）。請查閱 http://josm."
-#~ "openstreetmap.de/wiki/TaggingPresets 的說明。"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "加入新的標籤預設組合來源到清單。"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "標籤預設組合來源"
-
-#~ msgid ""
-#~ "<p>Please note that shortcuts keys are assigned to the actions when JOSM "
-#~ "is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
-#~ msgstr ""
-#~ "<p>請注意捷徑鍵是在 JOSM 啓動時才分配給各動作。因此您需要 <b>重新啟動</b> "
-#~ "JOSM 才能看到您的變更。</p>"
-
-#~ msgid ""
-#~ "<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, '.'/Period 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>"
-#~ msgstr ""
-#~ "<p>您可能會注意到下一頁的按鍵選擇清單列出了所有 Java 認識的按鍵，而不只是"
-#~ "在您鍵盤上的按鍵。請只使用確實能對應到您鍵盤上實際按鍵的數值。因此如果您的"
-#~ "鍵盤沒有「Copy」按鍵 （PC 鍵盤沒有它們，Sun 鍵盤才有），就不要使用它。同時"
-#~ "有些列出來的「按鍵」對應到您鍵盤上的特殊鍵（如 ':'/冒號）。也請不要使用它"
-#~ "們，而要使用其基底按鍵（US 鍵盤是 ';'/分號，德國鍵盤是 '.'/句點，...）來代"
-#~ "替。不照這個規則做可能會造成衝突，因為 JOSM 無法了解 Ctrl+Shift+; 和 Ctrl"
-#~ "+: 在 US 鍵盤上是相同的情形...</p>"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "空指標例外(NullPointerException)，可能是缺少標籤。"
-
-#~ msgid "Preparing data..."
-#~ msgstr "正在準備資料..."
-
-#~ msgid "Malformed sentences: "
-#~ msgstr "格式不良的段落： "
-
-#~ msgid "Unknown sentences: "
-#~ msgstr "不明的段落： "
-
-#~ msgid "Zero coordinates: "
-#~ msgstr "零坐標： "
-
-#~ msgid "preference ''{0}'' missing. Can't initialize OsmApi"
-#~ msgstr "缺少偏好設定「{0}」。不能初始化 OsmApi"
-
-#~ msgid ""
-#~ "It supports protocol versions 0.5 and 0.6, while the server says it "
-#~ "supports {0} to {1}."
-#~ msgstr "它支援 0.5 和 0.6 版的協定，但是該伺服器說它支援 {0} 到 {1}。"
-
-#~ msgid "Communications with {0} established using protocol version {1}"
-#~ msgstr "使用 {1} 版協定建立與 {0} 的連線"
-
-#~ msgid "Preparing..."
-#~ msgstr "正在準備..."
-
-#~ msgid "Uploading..."
-#~ msgstr "正在上傳..."
-
-#~ msgid "Unknown version"
-#~ msgstr "不明的版本"
-
-#~ msgid "Unknown version: {0}"
-#~ msgstr "不明的版本：{0}"
-
-#~ msgid "Do not show again"
-#~ msgstr "不再顯示"
-
-#~ msgid "No username provided."
-#~ msgstr "沒有提供使用者名稱。"
-
-#~ msgid "No password provided."
-#~ msgstr "沒有提供密碼。"
-
-#~ msgid "All images"
-#~ msgstr "所有圖片"
-
-#~ msgid "Invalid projection"
-#~ msgstr "無效的投影"
-
-#~ msgid "World"
-#~ msgstr "世界"
-
-#~ msgid "Slippy Map"
-#~ msgstr "快速地圖"
-
-#~ msgid "SlippyMap"
-#~ msgstr "快速地圖"
-
-#~ msgid "Optional"
-#~ msgstr "選用性的"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "<p>Thank you for your understanding</p>"
-#~ msgstr "<p>謝謝您的了解</p>"
-
-#~ msgid "Preset group ''{0}''"
-#~ msgstr "預設組合群組「{0}」"
-
-#~ msgid "Parse error: invalid document structure for gpx document"
-#~ msgstr "分析錯誤：gpx 文件有無效的文件結構"
-
-#~ msgid "unexpected format of id replied by the server, got ''{0}''"
-#~ msgstr "伺服器回覆未預期的 id 格式，取得「{0}」"
-
-#~ msgid "Opening changeset..."
-#~ msgstr "正在開啓資料組合..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "不正確的密碼或使用者名稱。"
-
-#~ msgid "No changeset present for diff upload"
-#~ msgstr "沒有需要進行差異上傳的資料組合"
-
-#~ msgid "mandatory attribute ''{0}'' missing"
-#~ msgstr "缺少必要的屬性「{0}」"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "OSM 資料缺少版本編號"
-
-#~ msgid "Error during parse."
-#~ msgstr "分析時發生錯誤。"
-
-#~ msgid "Failed to open connection to API {0}"
-#~ msgstr "開啟 API {0} 連線失敗"
-
-#~ msgid ""
-#~ "Couldn't connect to the osm server. Please check your internet connection."
-#~ msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "下列外掛程式有問題：\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Update Plugins"
-#~ msgstr "更新外掛程式"
-
-#~ msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-#~ msgstr[0] "已成功下載 {0} 個外掛程式。請重新啟動 JOSM。"
-
-#~ msgid "Download Plugins"
-#~ msgstr "下載外掛程式"
-
-#~ msgid "Missing attribute \"type\" on member {0} in relation {1}"
-#~ msgstr "在關係 {1} 的成員 {0} 中缺少屬性「type」"
-
-#~ msgid ""
-#~ "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-#~ msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#~ msgid "Missing attribute \"ref\" on member in relation {0}"
-#~ msgstr "在關係 {0} 的成員中缺少屬性「ref」"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。"
-
-#~ msgid ""
-#~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
-#~ "required."
-#~ msgstr "警告 - 要求 {0} 外掛程式的載入。這個外掛程式已不再需要。"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "找不到外掛程式：{0}。"
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "外掛程式 {1} 要求 外掛程式 {0} 但是找不到。"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "外掛程式 {0} 要求 JOSM 更新到 {1} 版。"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "從 {0} 網站下載的外掛程式資訊"
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager."
-#~ "warntime」。)"
-
-#~ msgid "More details"
-#~ msgstr "更多詳細資料"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "在非-路徑中發現 <nd> 元件。"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "在非-關係中發現 <member> 元件。"
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-#~ "use changesets, but API is not handle them. Ignoring changesets."
-#~ msgstr ""
-#~ "警告：偏好設定「{0}」或資料組合的 api 版本「{1}」要求使用變更組合，但 API "
-#~ "不處理它們。正在略過變更組合。"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "所有已安裝的外掛程式都是最新版。"
-
-#~ msgid ""
-#~ "An unexpected exception occurred.\n"
-#~ "\n"
-#~ "This is always a coding error. If you are running the latest\n"
-#~ "version of JOSM, please consider being kind and file a bug report."
-#~ msgstr ""
-#~ "發生未預期的例外。\n"
-#~ "\n"
-#~ "這常常是程式編寫的錯誤。如果您執行的是\n"
-#~ "最新版 JOSM，請不吝提供程式錯誤回報。"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "包含您導致此錯誤的步驟（愈詳細愈好）！"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr "在回報錯誤前請先試著更新到最新版的 JOSM 與所有外掛程式。"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "請確認包含下列資訊："
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr "<html>我的 GPS 接收器可以拍照。<br>這樣有幫助嗎？</html>"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "圖片沒有 exif 位置"
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "在 GPX 軌跡 {2} 中找到 {1} 的 {0} 個符合項"
-
-#~ msgid "The selected photos don't contain time information."
-#~ msgstr "選取的相片未包含時刻資訊。"
-
-#~ msgid "Photos don't contain time information"
-#~ msgstr "相片未包含時刻資訊"
-
-#~ msgid ""
-#~ "The selected GPX track doesn't contain timestamps. Please select another "
-#~ "one."
-#~ msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
-
-#~ msgid "Matched {0} of {1} photos to GPX track."
-#~ msgstr "已比對 {1} 張相片中的 {0} 張到 GPX 軌跡。"
-
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "在軌跡與相片間的補償：{0}分 {1}秒"
-
-#~ msgid ""
-#~ "Town/city {0} not found or not available in WMS.\n"
-#~ "Please check its availibility on www.cadastre.gouv.fr"
-#~ msgstr ""
-#~ "城/鎮 {0} 在 WMS 中找不到或無法使用。\n"
-#~ "請在 www.cadastre.gouv.fr 中檢查它的可用性"
-
-#~ msgid ""
-#~ "To enable the cadastre WMS plugin, change\n"
-#~ "the JOSM projection to Lambert and restart"
-#~ msgstr ""
-#~ "要啓用 cadastre WMS 外掛程式，請將\n"
-#~ "JOSM 投影改為蘭勃特投影後重新啟動"
-
-#~ msgid "Auto-tag source added:"
-#~ msgstr "自動標籤來源已加入："
-
-#~ msgid "role {0} is not participating in compare pair {1}"
-#~ msgstr "角色 {0} 沒有參與比較配對 {1}"
-
-#~ msgid "list in role {0} is currently not participating in a compare pair"
-#~ msgstr "角色 {0} 中的清單目前沒有參與比較配對"
-
-#~ msgid ""
-#~ "adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment"
-#~ msgstr "可調整的 {0} 尚未註冊。不能設定在同步調整中的參與"
-
-#~ msgid ""
-#~ "<html>An error occurred while communicating with the server<br>Details: "
-#~ "{0}</html>"
-#~ msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
-
-#~ msgid "Keep a clone of the local version"
-#~ msgstr "保留本地端版本的複本"
-
-#~ msgid "Physically delete from local dataset"
-#~ msgstr "實際從本地端資料組合中刪除"
-
-#~ msgid "Keep my visible state"
-#~ msgstr "保留我的可見性狀態"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} "
-#~ "to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-#~ "yo agree?</html>"
-#~ msgstr ""
-#~ "<html>要保留您的本地端版本，JOSM<br>必須將 {0} {1} 的 id 重設為 0。<br>在"
-#~ "下次上傳時伺服器會重新分配<br>新的 id 給它。<br>您是否同意？</html>"
-
-#~ msgid "Keep their visible state"
-#~ msgstr "保留他們的可見性"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "手動設定藍勃特區（例如用於兩個區域間的位置）"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "先開啓圖層　(GPX, OSM, 快取)"
-
-#~ msgid "Can't duplicate unordered way."
-#~ msgstr "不能重製未排序的路徑。"
-
-#~ msgid "OpenLayers"
-#~ msgstr "OpenLayers"
-
-#~ msgid ""
-#~ "<html>The openstreetbus plugin is using the old server at appspot.com."
-#~ "<br>A new server is available at schokokeks.org.<br>Do you want to switch "
-#~ "to the new server? (Strongly recommended)</html>"
-#~ msgstr ""
-#~ "<html>openstreetbus 外掛程式用的是在 appspot.com 的舊伺服器。<br>新的伺服"
-#~ "器在 schokokeks.org。<br>是否要切換至新的伺服器？（強烈建議）</html>"
-
-#~ msgid "confirm all Remote Control actions manually"
-#~ msgstr "手動確認所有的遠端控制動作"
-
-#~ msgid "A plugin that allows JOSM to be controlled from other applications."
-#~ msgstr "允許 JOSM 被其他應用程式控制的外掛程式。"
-
-#~ msgid "Settings for the Remote Control plugin."
-#~ msgstr "遠端控制外掛程式的設定值。"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "遠端控制外掛程式會一直聽取本機的 8111 連接埠。此連接埠是無法改變的，因為它"
-#~ "參照了外部應用程式與此外掛程式的溝通。"
-
-#~ msgid "autozoom"
-#~ msgstr "自動縮放"
-
-#~ msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
-#~ msgstr "按鈕「{0}」有重複的熱鍵 - 按鈕會被忽略！"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "將 TCX 檔案匯入為 GPS 軌跡"
-
-#~ msgid "Select a single, closed way of at least four nodes."
-#~ msgstr "選擇至少有四個節點的單一、封閉的路徑。"
-
-#~ msgid "Replaces Selection with Users data"
-#~ msgstr "以使用者資料取代選擇區域"
-
-#~ msgid "Please choose a user using the author panel"
-#~ msgstr "請使用作者面板選擇一個使用者"
-
-#~ msgid "Sorry, doesn't work with anonymous users"
-#~ msgstr "抱歉，不能用於匿名使用者"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。"
-
-#~ msgid "Only up to two areas can be joined at the moment."
-#~ msgstr "目前只能連結兩個區域。"
-
-#~ msgid "\"{0}\" is not closed and therefore can't be joined."
-#~ msgstr "「{0}」尚未封閉因此不能連結。"
-
-#~ 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 ""
-#~ "選取的路徑有在已下載資料區域之外的節點。\n"
-#~ "這樣可能會造成意外刪除某些節點。\n"
-#~ "確定要繼續嗎？"
-
-#~ msgid "Please select at least one closed way the should be joined."
-#~ msgstr "請選擇至少一個應該連結的封閉路徑。"
-
-#~ msgid "Joined self-overlapping area"
-#~ msgstr "已連結自我重疊的區域"
-
-#~ msgid "Join Areas: Remove Short Ways"
-#~ msgstr "連結區域：移除短路徑"
-
-#~ 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] "選擇區域包含 {0} 條路徑。確定要全部簡化？"
-
-#~ msgid "Data with errors. Upload anyway?"
-#~ msgstr "資料有錯誤。要強制上傳嗎？"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "檢驗目前的選擇區域或整個資料組合。"
-
-#~ msgid "Ignore the selected errors next time."
-#~ msgstr "下次忽略選取的錯誤。"
-
-#~ msgid ""
-#~ "This test checks if two roads, railways or waterways crosses in the same "
-#~ "layer, but are not connected by a node."
-#~ msgstr ""
-#~ "這會測試是否有兩條道路、鐵路或水路在同一圖層交錯，卻沒有以節點連接。"
-
-#~ msgid ""
-#~ "A relation membership was copied to all new ways.\n"
-#~ "You should verify this and correct it when necessary."
-#~ msgstr ""
-#~ "關係成員已複製到所有的新路徑。\n"
-#~ "您應該進行檢驗並在必要時修正它。"
-
-#~ msgid "History for {0} {1}"
-#~ msgstr "{0} {1} 的歷史紀錄"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "目前的差分： {0}秒"
-
-#~ msgid ""
-#~ "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-#~ "<strong>{2}</strong></html>"
-#~ msgstr ""
-#~ "<html>版本 <strong>{0}</strong> 由 <strong>{2}</strong> 建立於 <strong>{1}"
-#~ "</strong> </html>"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "請在 {0} 回報為 ticket"
-
-#~ msgid ""
-#~ "Download the following plugins?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "是否下載下列外掛程式？\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error reading plugin information file: {0}"
-#~ msgstr "讀取外掛程式資訊檔案時發生錯誤：{0}"
-
-#~ msgid "{0}: Version {1}{2}"
-#~ msgstr "{0}：版本 {1}{2}"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - 有 Geotag 的相片"
-
-#~ msgid "Display geotagged photos"
-#~ msgstr "顯示有 Geotag 的相片"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "以 AgPifoJ 開啟圖片..."
-
-#~ msgid "I'm in the timezone of: "
-#~ msgstr "我所在的時區： "
-
-#~ msgid "Open an other photo"
-#~ msgstr "開啟其他相片"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "尚未加上標籤的圖片"
-
-#~ msgid "Update position for: "
-#~ msgstr "更新位置： "
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX 軌跡已載入"
-
-#~ msgid "Lambert Zone 4 cache file (.4)"
-#~ msgstr "蘭勃特區 4 快取檔案 (.4)"
-
-#~ msgid "Lambert Zone 1 cache file (.1)"
-#~ msgstr "蘭勃特區 1 快取檔案 (.1)"
-
-#~ msgid "Lambert Zone 3 cache file (.3)"
-#~ msgstr "蘭勃特區 3 快取檔案 (.3)"
-
-#~ msgid "Lambert Zone 2 cache file (.2)"
-#~ msgstr "蘭勃特區 2 快取檔案 (.2)"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "先將投影改變為 {0}。"
-
-#~ msgid "Extract building footprints"
-#~ msgstr "解開建築足跡"
-
-#~ msgid "Zone"
-#~ msgstr "區域"
-
-#~ msgid "Lambert zone"
-#~ msgstr "蘭勃特區"
-
-#~ msgid "Download WMS tile from {0}"
-#~ msgstr "從 {0} 下載 WMS 拼貼"
-
-#~ msgid "Add a new layer"
-#~ msgstr "加入新的圖層"
-
-#~ msgid "Default Values"
-#~ msgstr "預設值"
-
-#~ msgid "(Time difference of {0} days)"
-#~ msgstr "({0} 天的時間差異)"
-
-#~ msgid "Duplicate Way"
-#~ msgstr "重製路徑"
-
-#~ msgid "Duplicate selected ways."
-#~ msgstr "重製選取的路徑。"
-
-#~ msgid "TangoGPS import faliure!"
-#~ msgstr "TangoGPS 匯入失敗！"
-
-#~ msgid "Create duplicate way"
-#~ msgstr "建立重複的路徑"
-
-#~ msgid "Grid origin location"
-#~ msgstr "格線原始位置"
-
-#~ msgid "Grid layer:"
-#~ msgstr "格線圖層："
-
-#~ msgid "Grid layout"
-#~ msgstr "格線配置"
-
-#~ msgid "Grid rotation"
-#~ msgstr "格線旋轉"
-
-#~ msgid "Add grid"
-#~ msgstr "加入格線"
-
-#~ msgid "Direction index '{0}' not found"
-#~ msgstr "找不到方向索引「{0}」"
-
-#~ msgid "Couldn't create new bug. Result: {0}"
-#~ msgstr "無法建立新的錯誤報告。結果：{0}"
-
-#~ msgid "osmarender options"
-#~ msgstr "osmarender 選項"
-
-#~ msgid "Permitted actions"
-#~ msgstr "准許的動作"
-
-#~ msgid "change the viewport"
-#~ msgstr "改變檢視連接埠"
-
-#~ msgid "load data from API"
-#~ msgstr "從 API 載入資料"
-
-#~ msgid "change the selection"
-#~ msgstr "改變選擇區域"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "初始化 API 失敗。請稍後再試一次。"
-
-#~ msgid "Show Tile Status"
-#~ msgstr "載入拼貼狀態"
-
-#~ msgid "Fade background: "
-#~ msgstr "淡化背景： "
-
-#~ msgid "error loading metadata"
-#~ msgstr "載入中繼資料時發生錯誤"
-
-#~ msgid "requested: {0}"
-#~ msgstr "要求的：{0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "要求更新時發生錯誤"
-
-#~ msgid "autoload tiles"
-#~ msgstr "自動載入拼貼"
-
-#~ msgid "Tile Sources"
-#~ msgstr "拼貼來源"
-
-#~ msgid "Settings for the SlippyMap plugin."
-#~ msgstr "快速地圖外掛程式的設定值。"
-
-#~ msgid "Auto zoom: "
-#~ msgstr "自動縮放： "
-
-#~ msgid "Autoload Tiles: "
-#~ msgstr "自動載入拼貼： "
-
-#~ msgid "Max zoom lvl: "
-#~ msgstr "最大縮放等級： "
-
-#~ msgid "start"
-#~ msgstr "開始"
-
-#~ msgid "end"
-#~ msgstr "結束"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "匯入 TCX 檔案..."
-
-#~ msgid "Show Author Panel"
-#~ msgstr "顯示作者面板"
-
-#~ msgid "Fix relations"
-#~ msgstr "修正關係"
-
-#~ msgid "Continue anyway"
-#~ msgstr "強制繼續"
-
-#~ msgid "Please select some data"
-#~ msgstr "請選取一些資料"
-
-#~ msgid "Open User Page in browser"
-#~ msgstr "在瀏覽器中開啟使用者頁面"
-
-#~ msgid "Select User's Data"
-#~ msgstr "選擇使用者的資料"
-
-#~ msgid "Open User Page"
-#~ msgstr "開啟使用者頁面"
-
-#~ msgid "Grid"
-#~ msgstr "格線"
-
-#~ msgid "Closed Way"
-#~ msgstr "封閉的路徑"
-
-#~ msgid "Fix the selected errors."
-#~ msgstr "修正選取的錯誤。"
-
-#~ msgid "Illegal tag/value combinations"
-#~ msgstr "不合法的標籤/數值組合"
-
-#~ msgid "Painting problem"
-#~ msgstr "繪圖問題"
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "檢查地圖繪製是否發現資料錯誤。"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "檢查繪圖筆記。"
-
-#~ msgid "Untagged and unconnected nodes"
-#~ msgstr "未加標籤與未連接的節點"
-
-#~ msgid "Reached a junction"
-#~ msgstr "到達交會點"
-
-#~ msgid "Reached the end of the line"
-#~ msgstr "到達線條的結尾"
-
-#~ msgid "Select a starting node on the end of a way"
-#~ msgstr "在路徑的結尾選擇開始的節點"
-
-#~ msgid ""
-#~ "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&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 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"
-#~ "&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."
-#~ msgstr ""
-#~ "您可以在 WMSplugin 偏好設定分頁中加入、編輯和刪除 WMS 項目 - 然後這些就會"
-#~ "在 WMS 選單中顯示出來。\n"
-#~ "\n"
-#~ "您也可以在進階偏好設定中手動完成它，使用下列配置：\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"
-#~ "完整 WMS URL 輸入格式範例 (landsat)\n"
-#~ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-#~ "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-#~ "\n"
-#~ "以 Metacarta 的地圖修正器 http://labs.metacarta.com/rectifier/ 來說，您只"
-#~ "需要輸入相對的「id」。\n"
-#~ "要加入 Metacarta 地圖修正器選單項目，手動建立如這個範例的 URL，並將 73 換"
-#~ "成您的圖片 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"
-#~ "注意：請確定圖片是合適的，沒有版權問題，如果有疑慮，請不要使用。"
-
-#~ msgid "Adjust the position of the selected WMS layer"
-#~ msgstr "調整選取的 WMS 圖層的位置"
-
-#~ msgid ""
-#~ "Couldn't match the entered link or id to the selected service. Please try "
-#~ "again."
-#~ msgstr "無法將整個連結或 id 與選取的服務進行比對。請再試一次。"
-
-#~ msgid "Enter a menu name and WMS URL"
-#~ msgstr "輸入選單名稱和 WMS URL"
-
-#~ msgid "WMS Plugin Preferences"
-#~ msgstr "WMS 外掛程式偏好設定"
-
-#~ msgid "WMS URL"
-#~ msgstr "WMS URL"
-
-#~ msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-#~ msgstr "修改在 WMS 外掛程式選單中顯示的 WMS 伺服器清單"
-
-#~ msgid "WMS URL (Default)"
-#~ msgstr "WMS URL（預設值）"
-
-#~ msgid "% of lat:"
-#~ msgstr "% 緯度："
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "請選擇要複製的列。"
-
-#~ msgid "Copy Default"
-#~ msgstr "複製預設值"
-
-#~ msgid "% of lon:"
-#~ msgstr "% 經度："
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "JOSM 的另一個 geotag 外掛程式。將相片與 GPS 軌跡關聯或匯入 EXIF 已有 "
-#~ "geotag 的相片。"
-
-#~ msgid ""
-#~ "Allows the user to create different color schemes and to switch between "
-#~ "them. Just change the colors and create a new scheme. Used to switch to a "
-#~ "white background with matching colors for better visibility in bright "
-#~ "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange "
-#~ "but true :-)"
-#~ msgstr ""
-#~ "允許使用者建立不同的顏色配置並在它們之間切換。只要改變顏色並建立新的配置即"
-#~ "可。可用來切換為白色背景以便在明亮的陽光下有較佳的視覺感受。請查閱 JOSM 偏"
-#~ "好設定中的對話盒與「地圖設定值」 (有點怪但確是真的 :-)"
-
-#~ msgid "Duplicate Ways with an offset"
-#~ msgstr "重製路徑並位移"
-
-#~ msgid "Displays an OpenLayers background image"
-#~ msgstr "顯示 OpenLayers 背景圖片"
-
-#~ msgid ""
-#~ "Simulates a click when you do a small and short drag. This is usefull for "
-#~ "tablet pens, when you have problems just clicking the tablet without the "
-#~ "mouse moving (general Java - tablet problem)."
-#~ msgstr ""
-#~ "當您進行小且短暫的拖曳時模擬為點選動作。這對平板電腦的觸控筆很有用，當您有"
-#~ "問題時只要點選面板而不需移動滑鼠（一般性 Java - 平板電腦問題）。"
-
-#~ msgid "Provide a background layer that displays a map grid"
-#~ msgstr "提供顯示地圖格線的背景圖層"
-
-#~ msgid ""
-#~ "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-#~ "background and request updates."
-#~ msgstr ""
-#~ "在 JOSM 中顯示快速地圖格線。可以從快速地圖中載入拼貼作為背景並要求更新。"
-
-#~ msgid "Let other applications send commands to JOSM."
-#~ msgstr "讓其他的應用程式傳送指令給 JOSM。"
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "直接從 JOSM 載入 TCX 檔案。"
-
-#~ msgid ""
-#~ "Tools to work with authors/users. Selects map data that belongs to "
-#~ "selected user, opens browser showing selected author profile page."
-#~ msgstr ""
-#~ "與作者/使用者相關的工具。選擇屬於選取的使用者的地圖資料，開啟瀏覽器顯示選"
-#~ "取的作者個人資料頁面。"
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
-
-#~ msgid ""
-#~ "An OSM data validator. It checks for problems in data, and provides fixes "
-#~ "for the common ones. Spellcheck integrated for tag names."
-#~ msgstr ""
-#~ "OSM 資料驗證器。它會檢查資料中的問題，並提供對一般問題的修正。同時整合了對"
-#~ "標籤名稱的拼字檢查。"
-
-#~ msgid ""
-#~ "Display georeferenced images as background in JOSM (WMS servers, "
-#~ "Yahoo, ...)."
-#~ msgstr "顯示地理參照圖片作為 JOSM 的背景(WMS 伺服器、Yahoo...)。"
-
-#~ msgid "Boat"
-#~ msgstr "小船"
-
-#~ msgid "Motorboat"
-#~ msgstr "動力小船"
-
-#~ msgid "Goods"
-#~ msgstr "貨物"
-
-#~ msgid "Max. Height (meters)"
-#~ msgstr "高度限制（米）"
-
-#~ msgid "Max. Width (meters)"
-#~ msgstr "寬度限制（米）"
-
-#~ msgid "Max. Length (meters)"
-#~ msgstr "長度限制（米）"
-
-#~ msgid "Bridleway"
-#~ msgstr "馬道"
-
-#~ msgid "Cycleway"
-#~ msgstr "自行車道"
-
-#~ msgid "Footway"
-#~ msgstr "人行步道"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "編輯產業道路等級 2"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "編輯產業道路等級 3"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "編輯產業道路等級 1"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "產業道路等級 3"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "產業道路等級 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "產業道路等級 2"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "編輯產業道路等級 4"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "編輯產業道路等級 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "編輯健走"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "登山"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "產業道路等級 5"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "產業道路等級 4"
-
-#~ msgid "Demanding Alpine Hiking"
-#~ msgstr "較難的高山健行"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "編輯較難的登山健行"
-
-#~ msgid "Alpine Hiking"
-#~ msgstr "高山健行"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "編輯高山健行"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "編輯登山健行"
-
-#~ msgid "Demanding Mountain Hiking"
-#~ msgstr "較難的登山健行"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "編輯較難的高山健行"
-
-#~ msgid "API initialization failed"
-#~ msgstr "API 初始化失敗"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "度-分-秒格式"
-
-#~ msgid "Communication with server failed"
-#~ msgstr "與伺服器溝通失敗"
-
-#~ msgid "Visible State:"
-#~ msgstr "可視狀態："
-
-#~ msgid "visible (on the server)"
-#~ msgstr "可視的（在伺服器上）"
-
-#~ msgid "not visible (on the server)"
-#~ msgstr "不可視（在伺服器上）"
-
-#~ msgid "Yes, reset the id"
-#~ msgstr "是，重設 id"
-
-#~ msgid "Reset id to 0"
-#~ msgstr "重設 id 為 0"
-
-#~ msgid "Yes, purge it"
-#~ msgstr "是，清除它"
-
-#~ msgid "Remove from dataset"
-#~ msgstr "從資料組合移除"
-
-#~ msgid "History item"
-#~ msgstr "歷史記錄項目"
-
-#~ msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-#~ msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳 {4}: {5} (id: {6})"
-
-#~ msgid "No plugin information found."
-#~ msgstr "找不到外掛程式資訊。"
-
-#~ msgid ""
-#~ "Update the following plugins:\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "更新下列外掛程式：\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "下載缺少的外掛程式"
-
-#~ msgid "Request Update"
-#~ msgstr "要求更新"
-
-#~ msgid "image not loaded"
-#~ msgstr "尚未載入圖片"
-
-#~ msgid "image loading..."
-#~ msgstr "正在載入圖片..."
-
-#~ msgid "help"
-#~ msgstr "求助"
-
-#~ msgid "Help / About"
-#~ msgstr "求助 / 關於"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "WMS 外掛程式求助"
-
-#~ msgid ""
-#~ "Another plugin to match images to the waypoints in a GPX file. A match is "
-#~ "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-#~ "the filename of an image."
-#~ msgstr ""
-#~ "另一個用來將圖片與 GPX 檔案中的航點配對的外掛程式。配對的方式是當航點標籤"
-#~ "的「name」、「cmt」或「desc」屬性與圖片的檔案名稱相符時就是配對成功。"
-
-#~ msgid "Station"
-#~ msgstr "車站"
-
-#~ msgid "Edit Station"
-#~ msgstr "編輯車站"
-
-#~ msgid "Shop"
-#~ msgstr "商店"
-
-#~ msgid "Map Type"
-#~ msgstr "地圖類型"
-
-#~ msgid "map"
-#~ msgstr "地圖"
-
-#~ msgid "Waterway Point"
-#~ msgstr "水路點"
-
-#~ msgid "Edit Airport"
-#~ msgstr "編輯機場"
-
-#~ msgid "citymap"
-#~ msgstr "城市地圖"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "編輯資訊服務處"
-
-#~ msgid "Board Type"
-#~ msgstr "板的類型"
-
-#~ msgid "hikingmap"
-#~ msgstr "健行地圖"
-
-#~ msgid "Guidepost (Hiking)"
-#~ msgstr "路標（徒步）"
-
-#~ msgid "Football"
-#~ msgstr "美式足球"
-
-#~ msgid "Edit Football"
-#~ msgstr "編輯美式足球"
-
-#~ msgid "Illegal object with id=0"
-#~ msgstr "不合法的物件，id=0"
-
-#~ msgid "Exception occurred"
-#~ msgstr "發生例外"
-
-#~ msgid "bicyclemap"
-#~ msgstr "自行車地圖"
-
-#~ msgid "football"
-#~ msgstr "美式足球"
-
-#~ msgid "rugby"
-#~ msgstr "橄欖球"
-
-#~ msgid "Motor Sports"
-#~ msgstr "摩托車運動"
-
-#~ msgid "Edit Motor Sports"
-#~ msgstr "編輯摩托車運動"
-
-#~ msgid "Rugby"
-#~ msgstr "橄欖球"
-
-#~ msgid "Edit Rugby"
-#~ msgstr "編輯橄欖球"
-
-#~ msgid "Amount of Wires"
-#~ msgstr "線數"
-
-#~ msgid "No data"
-#~ msgstr "沒有資料"
-
-#~ msgid "image "
-#~ msgstr "圖片 "
-
-#~ msgid "error requesting update: not zoom-level 12"
-#~ msgstr "要求更新發生錯誤：不縮放-等級 12"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "編輯艱難的高山健行"
-
-#~ msgid "Difficult Alpine Hiking"
-#~ msgstr "艱難的高山健行"
-
-#~ msgid "Amenities"
-#~ msgstr "便利設施"
-
-#~ msgid "Download List"
-#~ msgstr "下載清單"
-
-#~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
-
-#~ msgid "paramenter ''{0}'' must not be null"
-#~ msgstr "參數「{0}」不能為空值(null)"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 建立它。"
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 或 <A HREF=\"{1}\">您的語言</"
-#~ "A>建立它。"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "參數「{0}」必須不為空值(null)"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
-
-#~ msgid "Unexpected return value. Got {0}."
-#~ msgstr "未預期的回傳值。得到 {0}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "參數「{0}」應為 > 0，得到「{1}」"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "參數「{0}」不是有效的類型名稱，取得「{1}」"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
-
-#~ msgid "There's no version valid at date ''{0}'' in this history."
-#~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
-
-#~ msgid "No earliest version found. History is empty."
-#~ msgstr "找不到最早的版本。歷史紀錄是空的。"
-
-#~ msgid "No latest version found. History is empty."
-#~ msgstr "找不到最新的版本。歷史紀錄是空的。"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "參數目前超出範圍：得到 {0}"
-
-#~ msgid "Merged nodes not frozen yet. Can't build resolution command."
-#~ msgstr "合併的節點尚未凍結。不能建置決議指令"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "未預期的欄位索引。得到 {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "不能讀取 \"{0}\""
-
-#~ msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
-#~ msgstr "缺少偏好設定「{0}」。不能初始化 OsmApi"
-
-#~ msgid ""
-#~ "Couldn't connect to the OSM server. Please check your internet connection."
-#~ msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
-
-#~ msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-#~ msgstr "<html>無法讀取檔案「{0}」。<br>錯誤為：<br>{1}</html>"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "需要 Id > 0，卻收到 {0}"
-
-#~ msgid "Conflicts during download"
-#~ msgstr "下載時遇到衝突"
-
-#~ msgid "Select if the data should be downloaded in a new layer"
-#~ msgstr "如果資料要下載到新的圖層裡請選擇此項"
-
-#~ msgid ""
-#~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-#~ "resolve them first.</html>"
-#~ msgstr "<html>在圖層「{0}」中有未解決的衝突。<br>您必須先解決它們。</html>"
-
-#~ msgid "Didn''t find an object with id {0} in the current dataset"
-#~ msgstr "在目前的資料組合中找不到 id {0} 的物件"
-
-#~ msgid ""
-#~ "<html>Uploading <strong>failed</strong> because you''ve been "
-#~ "using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-#~ "again with a new or an existing open changeset.</html>"
-#~ msgstr ""
-#~ "<html>上傳 <strong>失敗</strong>，因為您使用的<br>變更組合 {0} 已經在 {1} "
-#~ "被關閉了。<br>請以新的或已開啟的變更組合再上傳一次。</html>"
-
-#~ msgid "Please enter a filter string."
-#~ msgstr "請輸入過濾條件字串。"
-
-#~ msgid "Always move and don't show dialog again"
-#~ msgstr "永遠進行移動而不要顯示這個對話盒"
-
-#~ msgid "Added {0} objects"
-#~ msgstr "已加入 {0} 物件"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr "不能復原「{0}」指令，因為圖層「{1}」已不存在"
-
-#~ msgid "At least one object to delete requird, got empty collection"
-#~ msgstr "至少要刪除一個物件，卻收到空白集合"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "參數「{0}」不能空白"
-
-#~ msgid "Purged object ''{0}''"
-#~ msgstr "清理的物件「{0}」"
-
-#~ msgid "Removing reference from relation {0}"
-#~ msgstr "從關係 {0} 移除參考"
-
-#~ msgid "Purged {0} objects"
-#~ msgstr "清理的 {0} 物件"
-
-#~ msgid "null detected in node list"
-#~ msgstr "在節點清單中偵測到 null"
-
-#~ msgid "unexpected null value for n.getEastNorth(). id of n is"
-#~ msgstr "在 n.getEastNorth() 有未預期的空值(null)。n 的 id 為"
-
-#~ msgid "Resolve version conflicts for way {0}"
-#~ msgstr "解決路徑 {0} 版本衝突"
-
-#~ msgid "Resolve version conflicts for node {0}"
-#~ msgstr "解決節點 {0} 版本衝突"
-
-#~ msgid "Resolve version conflicts for relation {0}"
-#~ msgstr "解決關係 {0} 版本衝突"
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-#~ "isn't a directory."
-#~ msgstr "警告：初始化偏好設定失敗。偏好設定目錄「{0}」不是一個目錄。"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "預期參數「{0}」> 0.0，卻收到 {1}"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "預期的陣列長度為 4，卻收到 {0}"
-
-#~ msgid ""
-#~ "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-#~ "isn't a directory.</html>"
-#~ msgstr ""
-#~ "<html>初始化偏好設定失敗。<br>偏好設定目錄「{0}」不是一個目錄。</html>"
-
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "正在上傳 {0} 個物件..."
-
-#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-#~ msgstr "樣式語法錯誤：在 {1} 中的樣式 {0} 是無效的！"
-
-#~ msgid "Wrong number of parameters for tags operator."
-#~ msgstr "標籤運算子的參數編號錯誤。"
-
-#~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
-#~ msgstr ""
-#~ "標籤運算子的數值不正確：{0}。標籤運算子預期的是標籤的編號或一個範圍，例如 "
-#~ "tags:1 或 tags:2-5"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr "目前的變更數超過最大值。變更的數量，目前為 {0}，最大值為 {1}"
-
-#~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr "無法取消指令「{0}」，因為圖層「{1}」已不存在"
-
-#~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-#~ msgstr "錯誤：伺服器的書籤清單中有未預期的行「{0}」"
-
-#~ msgid ""
-#~ "Failed to load bookmarks from ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr "基於安全性的理由無法從「{0}」載入書籤。例外為：{1}"
-
-#~ msgid "Failed to load load resource ''{0}''. Error is {1}"
-#~ msgstr "無法讀取載入資源「{0}」。錯誤為 {1}"
-
-#~ msgid "Missing merge target for object with id {0}"
-#~ msgstr "缺少 id {0} 物件的合併目標"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "預期 ID >= 0。收到 {0}。"
-
-#~ msgid "User with the same uid but different name found"
-#~ msgstr "發現同一 uid 的使用者但姓名卻不同"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "預期參數「{0}」> 0，卻收到 {1}"
-
-#~ msgid "<html>Could not write bookmark.<br>{0}</html>"
-#~ msgstr "<html>無法寫入書籤。<br>{0}</html>"
-
-#~ msgid ""
-#~ "note: For some tasks, JOSM needs a lot of memory. It can be necessary to "
-#~ "add the following\n"
-#~ "      Java option to increase the maximum size of allocated memory"
-#~ msgstr ""
-#~ "注意：在大多數工作中，JOSM 需要很多記憶體認出人意外。如果有需要可以加入下"
-#~ "列\n"
-#~ "      Java 選項來增加分配記憶體的最大容量"
-
-#~ msgid "Undecide conflict between visible state"
-#~ msgstr "在可視狀態間有未決定的衝突"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "參數「{0}」不能為空白。"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "標籤的參數「{0}」只能有一個鍵值。卻收到 {1}。"
-
-#~ msgid "Tag collection doesn't include the selected value ''{0}''."
-#~ msgstr "標籤集合不包含選取的數值「{0}」。"
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "請重新啟動 JOSM。"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Man-Made"
-#~ msgstr "人造物"
-
-#~ msgid "black"
-#~ msgstr "黑色"
-
-#~ msgid "brown"
-#~ msgstr "淺褐色"
-
-#~ msgid "red"
-#~ msgstr "紅色"
-
-#~ msgid "blue"
-#~ msgstr "藍色"
-
-#~ msgid "gray"
-#~ msgstr "灰色"
-
-#~ msgid "white"
-#~ msgstr "白色"
-
-#~ msgid "Updating primitive"
-#~ msgstr "正在更新原型"
-
-#~ msgid ""
-#~ "<html>There are {0} primitives in your local dataset which<br>might be "
-#~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
-#~ "<strong>{2}</strong> to ignore.<br></html>"
-#~ msgstr ""
-#~ "<html>在您的本地端資料組合中有 {0} 個原型可能在<br>伺服器上被刪除了。如果"
-#~ "您稍後想刪除或更新它們，<br>伺服器可能會回報發生<br>衝突。<br><br>點選"
-#~ "<strong>{1}</strong> 以檢查這些原型在伺服器上<br>的狀態。<br>點選 <strong>"
-#~ "{2}</strong> 則會略過它。<br></html>"
-
-#~ msgid "Deleted or moved primitives"
-#~ msgstr "已刪除或移動的原型"
-
-#~ msgid "Undelete {0} primitives"
-#~ msgstr "取消刪除 {0} 原型"
-
-#~ msgid ""
-#~ "Unable to add primitive {0} to the dataset because it's already included"
-#~ msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
 #~ "Please report this  at http://josm.openstreetmap.de . This is not a "
 #~ "critical error, it should be safe to continue in your work."
@@ -45519,1439 +43219,99 @@
 #~ "openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。"
 
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "Text"
-#~ msgstr "文字"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "M"
-#~ msgstr "M"
-
-#~ msgid "R"
-#~ msgstr "R"
-
-#~ msgid "A"
-#~ msgstr "A"
-
-#~ msgid "D"
-#~ msgstr "D"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "A primitive with ID = 0 can't be invisible."
-#~ msgstr "ID = 0 的原型不能為不可視。"
+#~ msgid "Changeset"
+#~ msgstr "變更組合"
 
 #~ msgid ""
-#~ "Can''t merge because either of the participating primitives is new and "
-#~ "the other is not"
-#~ msgstr "不能合併，因為加入的原型中一個是新的，另一個不是"
+#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
+#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
+#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+#~ "too.</html>"
+#~ msgstr ""
+#~ "<html>或者您也可以輸入<strong>拼貼位址</strong>指定單一拼貼，格式為 "
+#~ "<i>zoomlevel/x/y</i>，例如 <i>15/256/223</i>。拼貼位址的格式如 <i>zoom,x,"
+#~ "y</i> 或 <i>zoom;x;y</i> 也是可以使用的。</html>"
 
 #~ msgid ""
-#~ "Can''t merge primitives with different ids. This id is {0}, the other is "
-#~ "{1}"
-#~ msgstr "不能合併不同 id 的原型。這個 id 是 {0}，另一個是 {1}"
+#~ "<html>An upload and/or save operation of one layer with "
+#~ "modifications<br>was cancelled or has failed.</html>"
+#~ msgid_plural ""
+#~ "<html>Upload and/or save operations of {0} layers with "
+#~ "modifications<br>were cancelled or have failed.</html>"
+#~ msgstr[0] ""
+#~ "<html>上傳和/或儲存的選項，用於 {0} 個修改過的圖層<br>被取消或有錯誤時。</"
+#~ "html>"
 
 #~ msgid ""
-#~ "Tag collection can't be applied to a primitive because there are keys "
-#~ "with multiple values."
-#~ msgstr "標籤集無法套用到原型上，因為有鍵值含有多個數值。"
+#~ "<html>There are <strong>multiple changesets</strong> necessary in order "
+#~ "to upload {0} objects. What strategy do you want to use?</html>"
+#~ msgstr ""
+#~ "<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種"
+#~ "方式？</html>"
+
+#~ msgid "Always update withouth asking"
+#~ msgstr "永遠不詢問就更新"
 
 #~ msgid ""
-#~ "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-#~ msgstr "不能比較 ID「{0}」和 ID「{1}」的原型。"
-
-#~ msgid "UTM 20N (France)"
-#~ msgstr "UTM 20N (法國)"
-
-#~ msgid "UTM20 North Geodesic system"
-#~ msgstr "UTM20 北部地理測量系統"
+#~ "Error occured while parsing gpx file {0}. Only part of the file will be "
+#~ "available"
+#~ msgstr "解析 gpx 檔案 {0} 時發生錯誤。檔案將只有部分可以使用"
+
+#~ msgid "Prolog of OsmChange document not written yet. Please write frst."
+#~ msgstr "OsmChange 文件的序言尚未寫入。請先進行寫入。"
 
 #~ msgid ""
-#~ "Adjustable {0} not registered yet. Can't set participation in "
-#~ "synchronized adjustment."
-#~ msgstr "可調整的 {0} 尚未設定。不能在同步調整中設定參與。"
+#~ "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+#~ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+#~ msgstr ""
+#~ "元素「bounds」缺少必要的屬性。得到 minlon=''{0}'',minlat=''{1}'',"
+#~ "maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
+
+#~ msgid "Open an editor for the selected turn restricion"
+#~ msgstr "為選取的轉彎限制開啟編輯器"
 
 #~ msgid ""
-#~ "<html>There are {0} additional primitives referred to by relation {1}"
-#~ "<br>which are deleted on the server.<br><br>Do you want to undelete them "
-#~ "too?</html>"
+#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
+#~ msgstr "警告：忽略例外，因為工作已取消。例外：{0}"
+
+#~ msgid "Both"
+#~ msgstr "兩者"
+
+#~ msgid "unusual tag combination"
+#~ msgstr "不常見的標籤組合"
+
+#~ msgid ""
+#~ "JOSM will always listen at port 8111 on localhost.This port is not "
+#~ "configurable because it is referenced by external applications talking to "
+#~ "JOSM."
 #~ msgstr ""
-#~ "<html>這裡有 {0} 個額外的原型參照到已在<br>伺服器上刪除的關係 {1}。"
-#~ "<br><br>是否要將它們取消刪除？</html>"
-
-#~ msgid "Undelete dependent primitives?"
-#~ msgstr "是否取消刪除相依的原型？"
+#~ "JOSM 會聽取本機的連接埠 8111。這個連接埠是不能設定的，因為它是由外部與 "
+#~ "JOSM 溝通的應用程式所參照。"
+
+#~ msgid "A calibration file associated to the picture file was found:"
+#~ msgstr "找到關聯到圖片檔的校正檔案："
+
+#~ msgid "Also, frow now on, cal files will always be loaded automatically."
+#~ msgstr "同時，從現在起，cal 檔案都會自動載入。"
+
+#~ msgid "Fix adresses"
+#~ msgstr "修正地址"
 
 #~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do yo agree?</html>"
+#~ "(set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files)"
 #~ msgstr ""
-#~ "<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在"
-#~ "下次上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
+#~ "(將偏好設定中的  \"{0}\"  設定為 yes/no/ask\n"
+#~ "以控制校準檔案的自動載入)"
 
 #~ msgid ""
-#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
-#~ "the dataset.<br>Do you agree?</html>"
+#~ "Set  \"{0}\"  to yes/no/ask in the preferences\n"
+#~ "to control the autoloading of calibration files."
 #~ msgstr ""
-#~ "<html>JOSM 即將移除您本地資料組合中 id {0}<br>的原型。<br>您是否同意？</"
-#~ "html>"
-
-#~ msgid "Apply also for children"
-#~ msgstr "也套用到子項目"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "對話盒尚未建立。先呼叫 createInstance()"
-
-#~ msgid "Select primitives submitted by this user"
-#~ msgstr "選擇由這個使用者提交的原型"
-
-#~ msgid "Travel"
-#~ msgstr "旅遊"
-
-#~ msgid "Accomodation"
-#~ msgstr "住宿"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "Download primitives referring to one of the selected primitives"
-#~ msgstr "下載參照到已選取原型中之一的原型"
-
-#~ msgid "Toggle Fullscreen view"
-#~ msgstr "切換全螢幕檢視"
-
-#~ msgid "Merge the currently selected primitives into another layer"
-#~ msgstr "將目前選取的原型合併到另一個圖層"
-
-#~ msgid "Fullscreen View"
-#~ msgstr "全螢幕檢視"
-
-#~ msgid "Please enter a latitude in the range -90..90"
-#~ msgstr "請輸入緯度範圍 -90..90"
-
-#~ msgid "Please enter a valid longitude in the range -180..180"
-#~ msgstr "請輸入有效的經度範圍 -180..180"
-
-#~ msgid "Please enter a valid latitude in the range -90..90"
-#~ msgstr "請輸入有效的緯度範圍 -90..90"
-
-#~ msgid "Please enter a longitude in the range -180..180"
-#~ msgstr "請輸入經度範圍 -180..180"
-
-#~ msgid "Close the dialog, don't create a new node"
-#~ msgstr "關閉此對話盒，不要建立新的節點"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-#~ "primitive ''{1}''."
-#~ msgstr "警告：圖層「{0}」已不存在。不能移除原型「{1}」的衝突。"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict can't be added.</html>"
-#~ msgstr ""
-#~ "<html>圖層「{0}」已有衝突發生於原型<br>「{1}」。<br>這個衝突不能被加入。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
-#~ "missing on this system.</html>"
-#~ msgstr "<html>無法建立 URL，因為編碼「{0}」在此系統中<br>無法使用。</html>"
-
-#~ msgid ""
-#~ "<html>The merged nodes are members in one ore more relations. Please "
-#~ "decide whether your want to <strong>keep</strong> these memberships for "
-#~ "the target node or whether you want to <strong>remove</strong> them."
-#~ "<br>The default is to <strong>keep</strong> them: the target node will "
-#~ "take the place of the original node in the membership.</html>"
-#~ msgstr ""
-#~ "<html>合併的節點是一或多個關係的成員。請決定您要 <strong>保留</strong> 目"
-#~ "標節點的這些成員屬性或是要 <strong>移除</strong> 它們。<br>預設值是 "
-#~ "<strong>保留</strong> 它們：目標節點將會取代原本成員中節點的位置。</html>"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
-#~ "loaded"
-#~ msgstr "<html>子關係<br>{0}<br>已在伺服器中刪除。它已無法載入"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "衝突發生於資料"
-
-#~ msgid "({0}/{1}: Downloading relation ''{2}''..."
-#~ msgstr "({0}/{1}: 正在下載關係「{2}」..."
-
-#~ msgid ""
-#~ "Select relation members which refer to primitives in the current selection"
-#~ msgstr "選取參照到目前選取範圍的關係成員"
-
-#~ msgid "Remove all members referring to one of the selected primitives"
-#~ msgstr "移除所有參照到選取原型其中之一的成員"
-
-#~ msgid "Multiple members referring to same primitive"
-#~ msgstr "多個成員參照到同一原型"
-
-#~ msgid ""
-#~ "<html>This relation already has one or more members referring to<br>the "
-#~ "primitive ''{0}''<br><br>Do you really want to add another relation "
-#~ "member?</html>"
-#~ msgstr ""
-#~ "<html>這個關係已經有一或多個成員參照到<br>原型「{0}」<br><br>您確定要加入"
-#~ "另一個關係成員嗎？</html>"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first "
-#~ "selected member"
-#~ msgstr "將目前資料組合中選取的所有原型加到第一個選取的成員之前"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last "
-#~ "selected member"
-#~ msgstr "將目前資料組合中選取的所有原型加到最後一個選取的成員之後"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset before the first member"
-#~ msgstr "將目前資料組合中選取的所有原型加到第一個成員之前"
-
-#~ msgid ""
-#~ "Add all primitives selected in the current dataset after the last member"
-#~ msgstr "將目前資料組合中選取的所有原型加到最後一個成員之後"
-
-#~ msgid "Select primitives for selected relation members"
-#~ msgstr "選擇已選取關係成員的原型"
-
-#~ msgid ""
-#~ "Click to to return to the relation editor and to resume relation editing"
-#~ msgstr "點選以返回關係編輯器並繼續編輯關係"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>Please resolve this conflict first, then try again.</html>"
-#~ msgstr ""
-#~ "<html>圖層「{0}」已經有衝突於原型<br>「{1}」。<br>請先調解這個衝突，然後再"
-#~ "試一次。</html>"
-
-#~ msgid ""
-#~ "<html>This relation has been changed outside of the editor.<br>You can't "
-#~ "apply your changes and continue editing.<br><br>Do you want to create a "
-#~ "conflict and close the editor?</html>"
-#~ msgstr ""
-#~ "<html>這個關係已經在此編輯器以外的地方被改變了。<br>您不能套用自己的變更後"
-#~ "繼續編輯。<br><br>是否要建立衝突並關閉編輯器？</html>"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>您正在 {0} 原型上設定空角色。<br>這個動作等於要刪除這些原型的角色。"
-#~ "<br>您確定要套用此新角色嗎？</html>"
-
-#~ msgid "No, don't apply"
-#~ msgstr "否，不套用"
-
-#~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
-#~ msgstr "變更組合運算子的數值不正確：{0}。須使用數字。"
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} 個外掛程式下載成功。"
-
-#~ msgid ""
-#~ "<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a "
-#~ "valid username and a valid password.</html>"
-#~ msgstr ""
-#~ "<html>在 HTTP 代理伺服器「{0}」驗證失敗。請輸入有效的使用者名稱和密碼。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "<html>Warning: depending on the authentication method the proxy server "
-#~ "uses the password may be transferred unencrypted.</html>"
-#~ msgstr ""
-#~ "<html>警告：根據此代理伺服器所使用的驗證方式，密碼可能是以未加密的方式傳"
-#~ "輸。</html>"
-
-#~ msgid "Warning: no preference ''{0}'' found. Will use no proxy."
-#~ msgstr "警告：找不到偏好設定「{0}」。將不使用代理伺服器。"
-
-#~ msgid ""
-#~ "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-#~ "''{1}''. Proxy won't be used"
-#~ msgstr ""
-#~ "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不使"
-#~ "用代理伺服器"
-
-#~ msgid ""
-#~ "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-#~ "''{1}''. Proxy won't be used"
-#~ msgstr ""
-#~ "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。將不"
-#~ "使用代理伺服器"
-
-#~ msgid ""
-#~ "Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
-#~ msgstr ""
-#~ "在偏好設定「{0}」中連接埠號碼是無效的。得到的數值是「{1}」。將不使用代理伺"
-#~ "服器。"
-
-#~ msgid ""
-#~ "Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
-#~ "Proxy won't be used."
-#~ msgstr ""
-#~ "在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代"
-#~ "理伺服器。"
-
-#~ msgid ""
-#~ "Warning: the JVM is not configured to lookup proxies from the system "
-#~ "settings. The property ''java.net.useSystemProxies'' was missing at "
-#~ "startup time. Won't use a proxy."
-#~ msgstr ""
-#~ "警告：JVM 並未設定為以系統設定值查詢代理伺服器。在啟動時缺少「java.net."
-#~ "useSystemProxies」屬性。將不使用代理伺服器。"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "預期參數 ''{0}'' >= 0，卻收到 {1}"
-
-#~ msgid "Set the 'modified' flag for relation {0}"
-#~ msgstr "在關係 {0} 設定「modified」旗標"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "預期的數值為 child.getId() > 0。卻得到 {1}。"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: "
-#~ msgstr "警告：因為工作已取消故忽略例外。例外為： "
-
-#~ msgid ""
-#~ "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-#~ "maxlon): {0}, {1}, {2}, {3}</html>"
-#~ msgstr ""
-#~ "<html><strong>目前的下載區域</strong> (最小緯度, 經度, 最大緯度, 經度)： "
-#~ "{0}, {1}, {2}, {3}</html>"
-
-#~ msgid "Click do download the currently selected area"
-#~ msgstr "點選以下載目前選取的區域"
-
-#~ msgid ""
-#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-#~ msgstr ""
-#~ "<html>不論 <strong>{0}</strong> 或 <strong>{1}</strong> 都沒有啟用。<br>請"
-#~ "選擇下載 OSM 資料，或 GPX 資料，或兩個都選。</html>"
-
-#~ msgid ""
-#~ "<html>Failed to open help page for url {0}.<br>This is most likely due to "
-#~ "a network problem, please check your<br>your internet connection</html>"
-#~ msgstr ""
-#~ "<html>無法在 {0} 開啟求助頁面。<br>這大部分是網路的問題造成的，請檢查您的"
-#~ "<br>網際網路連線</html>"
-
-#~ msgid ""
-#~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-#~ "Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-#~ "Hold left mousebutton and draw a frame."
-#~ msgstr ""
-#~ "<b>縮放：:</b> 滑鼠滾輪、雙擊或 Ctrl + Up/Down <b>移動地圖：</b> 按住滑鼠"
-#~ "右鍵並移動滑鼠或使用方向鍵。 <b>選擇：</b>按住滑鼠左鍵並繪出一個方格。"
-
-#~ msgid "\"{0}\" is not closed and therefore cannot be joined."
-#~ msgstr "「{0}」尚未封閉因此不能連結。"
-
-#~ msgid ""
-#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-#~ "<br>This conflict cannot be added.</html>"
-#~ msgstr ""
-#~ "<html>圖層「{0}」已有衝突發生於原型<br>「{1}」。<br>這個衝突不能被加入。</"
-#~ "html>"
-
-#~ msgid ""
-#~ "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict "
-#~ "for primitive ''{1}''."
-#~ msgstr "警告：圖層「{0}」已不存在。不能移除原型「{1}」的衝突。"
-
-#~ msgid "The \"from\" way does not start or end at a \"via\" node."
-#~ msgstr "「從」路徑沒有開始或結束於「經過」節點。"
-
-#~ msgid "The \"to\" way does not start or end at a \"via\" node."
-#~ msgstr "「到」路徑沒有開始或結束於「經過」節點。"
-
-#~ msgid "The \"from\" way does not start or end at the \"via\" way."
-#~ msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
-
-#~ msgid "The \"to\" way does not start or end at the \"via\" way."
-#~ msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
-
-#~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded"
-#~ msgstr "<html>子關係<br>{0}<br>已在伺服器中刪除。它已無法載入"
-
-#~ msgid "Download Object..."
-#~ msgstr "下載物件..."
-
-#~ msgid "Download Object"
-#~ msgstr "下載物件"
-
-#~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
-#~ msgstr "<html>不能開啟目錄。<br>請選擇一個檔案！</html>"
-
-#~ msgid "Move nodes so all angles are 90 or 270 degrees"
-#~ msgstr "移動節點讓所有的角度成為 90 或 270 度"
-
-#~ msgid "Undelete {0} primitive"
-#~ msgid_plural "Undelete {0} primitives"
-#~ msgstr[0] "取消刪除 {0} 個原型"
-
-#~ msgctxt "filter"
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid ""
-#~ "Following primitives could not be added because they are deleted: {0}"
-#~ msgstr "無法加入下列原型，因為它們已被刪除：{0}"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "請輸入上傳備註（最小 3 個字元）"
-
-#~ msgctxt "gps"
-#~ msgid "track"
-#~ msgid_plural "tracks"
-#~ msgstr[0] "軌跡"
-
-#~ msgid "Use all their elements"
-#~ msgstr "使用他們所有的元素"
-
-#~ msgid "Use all mine elements"
-#~ msgstr "使用我所有的元素"
-
-#~ msgid ""
-#~ "The copied data contains incomplete primitives.  When pasting the "
-#~ "incomplete primitives are removed.  Do you want to paste the data without "
-#~ "the incomplete primitives?"
-#~ msgstr ""
-#~ "複製的資料含有不完整的原型。當貼上的時候不完整的原型會被移除。您確定要貼上"
-#~ "含有不完整原型的資料嗎？"
-
-#~ msgid "to {0} primitive"
-#~ msgid_plural "to {0} primtives"
-#~ msgstr[0] "到 {0} 個原型"
-
-#~ msgid ""
-#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
-#~ "deleted on the server.<br><br>Do you want to undelete this too?"
-#~ msgid_plural ""
-#~ "There are {0} additional primitives referred to by relation {1}<br>which "
-#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
-#~ msgstr[0] ""
-#~ "有 {0} 個額外原型用於<br>在伺服器上刪除的關係 {1} 。<br><br>您是否也想要取"
-#~ "消刪除它？"
-
-#~ msgid ""
-#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
-#~ "server.<br><br>Do you want to undelete this node too?"
-#~ msgid_plural ""
-#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
-#~ "the server.<br><br>Do you want to undelete these nodes too?"
-#~ msgstr[0] ""
-#~ "有 {0} 個額外節點用於<br>在伺服器上刪除的路徑 {1} 。<br><br>您是否也想要取"
-#~ "消刪除這個節點？"
-
-#~ msgid "Merging deleted primitives failed"
-#~ msgstr "合併刪除的原型失敗"
-
-#~ msgid ""
-#~ "The following primitives could not be copied to the target "
-#~ "primitive<br>because they are deleted in the target dataset:"
-#~ msgstr ""
-#~ "下列原型無法複製到目標原型，<br>因為它們已經在目標資料組合中被刪除了："
-
-#~ msgid ""
-#~ "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-#~ "its normal."
-#~ msgstr "拖曳一個路徑來製作矩形。按 Ctrl 後拖曳並以平常的方式移動一個區段。"
-
-#~ msgid "Download and show the history of the selected primitives"
-#~ msgstr "下載並顯示選取原型的歷史紀錄"
-
-#~ msgid ""
-#~ "Zoom to the primitives in the content of this changeset in the current "
-#~ "data layer"
-#~ msgstr "縮放到目前資料圖層這個變更組合的內容的原型"
-
-#~ msgid "You are setting an empty role on {0} primitive."
-#~ msgid_plural "You are setting an empty role on {0} primitives."
-#~ msgstr[0] "您正在設定 {0} 個原型的空白角色。"
-
-#~ msgid "This is equal to deleting the roles of these primitives."
-#~ msgstr "這樣等同刪除這些原型的角色。"
-
-#~ msgid ""
-#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
-#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
-#~ "strong> is not available yet. It is missing both in your local language "
-#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
-#~ msgstr ""
-#~ "<html><p class=\"warning-header\">缺少求助主題的內容</p><p class="
-#~ "\"warning-body\">求助主題的內容<strong>{0}</strong>尚不能取得。不管是您當"
-#~ "地語言 ({1}) 或是英語版本都沒有。<br><br>請協助改進 JOSM 求助系統並填好缺"
-#~ "少的資訊。您可以編輯<a href=\"{2}\">將求助主題編輯為當地的語言 ({1})</a> "
-#~ "和 <a href=\"{3}\">英語版本</a>。</p></html>"
-
-#~ msgid "create new objects"
-#~ msgstr "建立新的物件"
-
-#~ msgid ""
-#~ "WARNING: unexpected format of API base URL. Redirection to info or "
-#~ "history page for OSM primitive will probably fail. API base URL is: "
-#~ "''{0}''"
-#~ msgstr ""
-#~ "警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 原型的資訊或歷史紀錄頁面"
-#~ "可能會失敗。API 基礎 URL 為：「{0}」"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "請輸入這個上傳變更組合的註解 (最少 3 個字元)"
-
-#~ msgid ""
-#~ "{0} conflict has been <strong>resolved automatically</strong> by purging "
-#~ "{0} object<br>from the local dataset because it is deleted on the server."
-#~ msgid_plural ""
-#~ "{0} conflicts have been <strong>resolved automatically</strong> by "
-#~ "purging {0} objects<br> from the local dataset because they are deleted "
-#~ "on the server."
-#~ msgstr[0] ""
-#~ "{0} 衝突已經以清除本地資料組合 {0} 物件的方式<strong>自動調解</strong> "
-#~ "<br>了。因為它已經從伺服器上刪除了。"
-
-#~ msgid ""
-#~ "{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve it."
-#~ msgid_plural ""
-#~ "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-#~ "Dialog and manually resolve them."
-#~ msgstr[0] ""
-#~ "還有 {0} 個衝突待調解。<br><br>請開啟衝突清單對話盒並手動調解它。"
-
-#~ msgid ""
-#~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-#~ msgstr "警告：從「{0}」解析 Mappaint 樣式失敗。例外為：{1}"
-
-#~ msgid ""
-#~ "Please enter your OSM user name and password. The password will "
-#~ "<strong>not</strong> be saved in clear text in the JOSM preferences and "
-#~ "it will be submitted to the OSM server <strong>only once</strong>. "
-#~ "Subsequent data upload requests don't use your password any more."
-#~ msgstr ""
-#~ "請輸入您的 OSM 使用者名稱和密碼。密碼將<strong>不會</strong>以明文的方式儲"
-#~ "存在 JOSM 偏好設定，同時它也只會傳送到 OSM 伺服器<strong>一次</strong>。往"
-#~ "後的資料上傳要求不會再使用您的密碼。"
-
-#~ msgid ""
-#~ "<strong>Warning:</strong> The password is transferred <strong>once</"
-#~ "strong> in clear text to the OSM website. <strong>Do not</strong> use a "
-#~ "sensitive password until the OSM server provides an encrypted "
-#~ "communication channel (HTTPS)."
-#~ msgstr ""
-#~ "<strong>警告：</strong>密碼會有<strong>一次</strong>以明文傳送到 OSM 網"
-#~ "站。直到 OSM 伺服器提供加密通訊頻道 (HTTPS) 前<strong>不要</strong>使用重"
-#~ "要的密碼。"
-
-#~ msgid "Icon paths"
-#~ msgstr "圖示路徑"
-
-#~ msgid "Add a filename or an URL of an active style"
-#~ msgstr "為使用的樣式加入檔案名稱或 URL"
-
-#~ msgid "Invalid ID specified. Cannot download object."
-#~ msgstr "指定了無效的 ID。不能下載物件。"
-
-#~ msgid ""
-#~ "Target object with id {0} and version {1} is visible although source "
-#~ "object with lower version {2} is not visible. Cannot deal with this "
-#~ "inconsistency. Keeping target object. "
-#~ msgstr ""
-#~ "id {0} 版本 {1} 的目標物件是可視的，但是來源物件 (較低版本 {2}) 是隱藏的。"
-#~ "不能處理這個不一致的情形。保留目標物件。 "
-
-#~ msgid ""
-#~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values "
-#~ "must be the same as in values"
-#~ msgstr ""
-#~ "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的"
-#~ "相同"
-
-#~ msgid ""
-#~ "Server replied with response code 404, retrying with an individual "
-#~ "request for each primitive."
-#~ msgstr "伺服器傳回代碼 404，以每個原型個別要求的方式重試。"
-
-#~ msgid ""
-#~ "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' "
-#~ "was not found.<br>Delete from preferences?"
-#~ msgstr ""
-#~ "<html>無法載入外掛程式 {0} 因為外掛程式<br>main 類別「{1}」找不到。<br>是"
-#~ "否從偏好設定刪除？"
-
-#~ msgid "Illegal upload comment"
-#~ msgstr "不合格的上傳註解"
-
-#~ msgid ""
-#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
-#~ "this primitive and retrying to upload."
-#~ msgstr "警告：原型「{0}」已在伺服器上刪除了。正略過這個原型並嘗試重新上傳。"
-
-#~ msgid "Preparing primitives to upload ..."
-#~ msgstr "正在準備要上傳的原型 ..."
-
-#~ msgid "Used style"
-#~ msgstr "使用者樣式"
-
-#~ msgid "Active styles"
-#~ msgstr "使用中樣式"
-
-#~ msgid "Available styles (from {0})"
-#~ msgstr "可用的樣式 (來自 {0})"
-
-#~ msgid ""
-#~ "You cannot align connected segments.\n"
-#~ "Please select two segments that don''t share any nodes."
-#~ msgstr ""
-#~ "您不能對齊相互連接的區段。\n"
-#~ "請選取兩個沒有共用任何節點的區段。"
-
-#~ msgid ""
-#~ "Aligning would result nodes outside the world.\n"
-#~ "Your action is being reverted."
-#~ msgstr ""
-#~ "對齊會造成節點掉出世界之外。\n"
-#~ "您的動作被還原了。"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">Welcome to the</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> Plugin<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...or it rather should be called <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
-#~ "italic;\">\n"
-#~ "<span style=\"font-size: large;\">歡迎使用</span><br>\n"
-#~ "<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb"
-#~ "(204, 85, 0);\">S</span> 外掛程式<br>\n"
-#~ "</span><span style=\"font-size: medium;\"><br>\n"
-#~ "...或者它應該被稱為 <br>\n"
-#~ "<span style=\"font-size: large;\">AlignWayS(egments)</span> 外掛程式...</"
-#~ "span>\n"
-#~ "</div>\n"
-#~ "</html>"
-
-#~ msgid ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
-#~ "\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
-#~ "<b>Tools</b>\n"
-#~ " menu or may want to place the action on the <b>toolbar</b>.\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "<html>\n"
-#~ "<div style=\"font-family:sans-serif\">\n"
-#~ "<ul>\n"
-#~ "  <li><b>對齊區段。</b> 請按 <b><i><span style=\"color:green\">Shift-A</"
-#~ "span></i></b>。另外您可以在<b>工具</b>選單找到這個指令\n"
-#~ "，也可以把這個動作放置到<b>工具列</b>上。\n"
-#~ "  </li>\n"
-#~ "</ul>\n"
-#~ "</div>\n"
-#~ "</html>\n"
-#~ "\n"
-
-#~ msgid "Point on angle of building to start drawing"
-#~ msgstr "點到建築的一角以開始繪製"
-
-#~ msgid "Point on opposite end of building"
-#~ msgstr "點到建築物對面的結尾"
-
-#~ msgid "Extract building on click (vector images only)"
-#~ msgstr "點選解開建築 (只適用向量圖片)"
-
-#~ msgid ""
-#~ "This feature requires (at least) one special cadastre\n"
-#~ "Buildings layer and an OSM data layer."
-#~ msgstr ""
-#~ "這個功能需要（至少）一個特殊的 cadastre\n"
-#~ "建築圖層和 OSM 資料圖層。"
-
-#~ msgid "Grab building layer only"
-#~ msgstr "只抓取建築物圖層"
-
-#~ msgid ""
-#~ "You are about to delete incomplete objects.<br>This will cause problems "
-#~ "because you don't see the real object.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "您即將刪除不完整的物件。<br>這樣會造成問題，因為您沒有看到實際的物件。<br>"
-#~ "您確定要刪除嗎？"
-
-#~ msgid ""
-#~ "This changeset have objects outside the downloaded area.\n"
-#~ "It is needed to download them before reverting. Do you want to continue?"
-#~ msgstr ""
-#~ "這個變更組合有位於下載區域外的物件。\n"
-#~ "在還原之前需要下載它們。您是否要繼續？"
-
-#~ msgid ""
-#~ "Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-#~ "behind shortcut ''{1}'' by action ''{2}''"
-#~ msgstr ""
-#~ "警告：turnrestrictions 外掛程式將捷徑鍵「{1}」原本的動作「{0}」替換成動作"
-#~ "「{2}」"
-
-#~ msgid "Insert 'via' objects from the clipboard"
-#~ msgstr "從剪貼簿插入「via」物件"
-
-#~ msgid ""
-#~ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-#~ "server"
-#~ msgstr "錯誤：伺服器的書籤清單的「{1}」行有不合格的 double 數值「{0}」"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "id {1} 類型 {0} 的目標有無效的版本"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-#~ "span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "這個轉彎限制使用 OSM 節點 <span class=\"object-name\">{0}</span> 作為角色 "
-#~ "<tt>{1}</tt> 的成員。"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM relation <span class=\"object-name\">"
-#~ "{0}</span> as member with role <tt>{1}</tt>."
-#~ msgstr ""
-#~ "這個轉彎限制使用 OSM 關係 <span class=\"object-name\">{0}</span> 作為角色 "
-#~ "<tt>{1}</tt> 的成員。"
-
-#~ msgid "An OSM way is required instead."
-#~ msgstr "需要 OSM 路徑代替。"
-
-#~ msgid "Change to the Basic Editor and select an OSM way"
-#~ msgstr "改變為基本編輯器並選擇 OSM 路徑"
-
-#~ msgid ""
-#~ "This test checks that there are no ways with same tags and same node "
-#~ "coordinates."
-#~ msgstr "這個測試會檢查有無同樣標籤及節點坐標的路徑。"
-
-#~ msgid ""
-#~ "This test finds multilingual objects whose 'name' attribute is not equal "
-#~ "to some 'name:*' attribute and not a composition of 'name:*' attributes, "
-#~ "e.g., Italia - Italien - Italy."
-#~ msgstr ""
-#~ "這個測試會檢查多語系物件的「name」屬性不會等同於某些「name:*」屬性，並且也"
-#~ "不是由「name:*」屬性組成。例如：Italia - Italien - Italy。"
-
-#~ msgid "Please select the WMS layer to adjust."
-#~ msgstr "請選擇要調整的 WMS 圖層。"
-
-#~ msgid "There are currently no WMS layer to adjust."
-#~ msgstr "目前沒有 WMS 圖層要調整。"
-
-#~ msgid ""
-#~ "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with "
-#~ "a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS "
-#~ "request. You should check your<br>preference settings.<br>Do you want to "
-#~ "fetch WMS tiles anyway?"
-#~ msgstr ""
-#~ "<html>這個 WMS 圖層的基礎 URL<br>「{0}」<br>的結尾不能是「&」或「?」。<br>"
-#~ "這可能會導致無效的 WMS 要求。您應該檢查您的<br>偏好設定值。<br>是否要強制"
-#~ "取回 WMS 拼貼？"
-
-#~ msgid "farmland"
-#~ msgstr "農田"
-
-#~ msgid ""
-#~ "Create multipolygons by one click, much easier than standard way with "
-#~ "relation editor."
-#~ msgstr "點一下就可以建立多重多邊形，比標準使用關係編輯器的方式更加容易。"
-
-#~ msgid ""
-#~ "<html>To keep your local version, JOSM<br>has to reset the id of "
-#~ "primitive {0} to 0.<br>On the next upload the server will assign<br>it a "
-#~ "new id.<br>Do you agree?</html>"
-#~ msgstr ""
-#~ "<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在"
-#~ "下次上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
-
-#~ msgid "Zoom to the corresponding primitives in the current data layer"
-#~ msgstr "縮放到目前資料圖層對應的原型"
-
-#~ msgid ""
-#~ "Select relation members which refer to {0} primitives in the current "
-#~ "selection"
-#~ msgstr "選取參照到目前選取範圍 {0} 原型的關係成員"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "警告：找不到偏好設定「{0}」。"
-
-#~ msgid "Set width of building"
-#~ msgstr "設定建築物的寬度"
-
-#~ msgid "Grab buildings"
-#~ msgstr "抓取建築"
-
-#~ msgid "Multipolygon must consist only of closed ways."
-#~ msgstr "多重多邊形必須由封閉的路徑組成。"
-
-#~ msgid "You must select at least two ways."
-#~ msgstr "您必須選擇至少兩條路徑。"
-
-#~ msgid "Loads calibration data to a file"
-#~ msgstr "將校準資料載入到檔案"
-
-#~ msgid "Image not created properly."
-#~ msgstr "圖片無法正確的建立。"
-
-#~ msgid "Missing new dataset object for {0} with id {1}"
-#~ msgstr "缺少 id {1} {0} 的新資料組合物件"
-
-#~ msgid "Min zoom lvl: "
-#~ msgstr "最小縮放等級： "
-
-#~ msgid "Splits the way"
-#~ msgstr "切割這個路徑"
-
-#~ msgid "Select WMS layer"
-#~ msgstr "選擇 WMS 圖層"
-
-#~ msgid "Copy Selected Default(s)"
-#~ msgstr "複製已選取的預設值"
-
-#~ msgid "mountain_hiking"
-#~ msgstr "登山"
-
-#~ msgid "demanding_mountain_hiking"
-#~ msgstr "費力的登山"
-
-#~ msgid "alpine_hiking"
-#~ msgstr "高山登山"
-
-#~ msgid "Point on the corner of building to start drawing"
-#~ msgstr "點選開始繪製建築物的角落"
-
-#~ msgid "Unable to read autosaved osm data ({0}) - {1}"
-#~ msgstr "無法讀取自動儲存的 osm 資料 ({0}) - {1}"
-
-#~ msgid ""
-#~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
-#~ "time. Do you want to restore data?"
-#~ msgstr ""
-#~ "JOSM 發現 {0} 個未儲存的 osm 資料圖層。看起來上次 JOSM 當機了。您是否要還"
-#~ "原資料？"
-
-#~ msgid "Building tag:"
-#~ msgstr "建築物標籤："
-
-#~ msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-#~ msgstr "不使用住址的關係（除了元素 \"addr:street\"）。"
-
-#~ msgid "Child script have returned invalid data."
-#~ msgstr "子命令稿傳回了無效的資料。"
-
-#~ msgid ""
-#~ "This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-#~ "span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. "
-#~ "In a turn restriction, the way with role <tt>from</tt> should be "
-#~ "different from the way with role <tt>to</tt>, though."
-#~ msgstr ""
-#~ "這個轉彎限制使用的 OSM 路徑 <span class=\"object-name\">{0}</span> 具有角"
-#~ "色 <tt>from</tt> <strong>和</strong>角色 <tt>to</tt>。但是，在轉彎限制中，"
-#~ "具有角色 <tt>from</tt> 的路徑和角色 <tt>to</tt> 的路徑不能是同一條。"
-
-#~ msgid ""
-#~ "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and "
-#~ "the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-#~ "interesect at node <span class=\"object-name\">{2}</span> but <span class="
-#~ "\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It "
-#~ "is recommended to set <span class=\"object-name\">{2}</span> as unique "
-#~ "<strong>via</strong>-object."
-#~ msgstr ""
-#~ "<strong>from</strong>-路徑 <span class=\"object-name\">{0}</span> 和 "
-#~ "<strong>to</strong>-路徑 <span class=\"object-name\">{1}</span> 在節點 "
-#~ "<span class=\"object-name\">{2}</span> 相交叉，但是 <span class=\"object-"
-#~ "name\">{2}</span> 並不是 <strong>via</strong>-物件。<br> 建議將 <span "
-#~ "class=\"object-name\">{2}</span> 設定為獨一的 <strong>via</strong>-物件。"
-
-#~ msgid ""
-#~ "An OSM way with role <tt>from</tt> is required in a turn restriction."
-#~ msgstr "在轉彎限制中需要角色為 <tt>from</tt> 的 OSM 路徑。"
-
-#~ msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-#~ msgstr "在轉彎限制中需要角色為 <tt>to</tt> 的 OSM 路徑。"
-
-#~ msgid "Please go to the Basic editor and manually choose an OSM way."
-#~ msgstr "請移至基本編輯器並手動選擇 OSM 路徑。"
-
-#~ msgid "Add an OSM way with role ''from''"
-#~ msgstr "加入角色為「from」的 OSM 路徑"
-
-#~ msgid "Add an OSM way with role ''to''"
-#~ msgstr "加入角色為「to」的 OSM 路徑"
-
-#~ msgid ""
-#~ "The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
-#~ "should be split at node <span class=\"object-name\">{2}</span> where it "
-#~ "connects to way <span class=\"object-name\">{3}</span>."
-#~ msgstr ""
-#~ "角色為 <tt>{1}</tt> 的 OSM 路徑 <span class=\"object-name\">{0}</span>應該"
-#~ "從它連接到路徑 <span class=\"object-name\">{3}</span> 的節點 <span class="
-#~ "\"object-name\">{2}</span> 處分離。"
-
-#~ msgid "{0} {1}% of GPS track"
-#~ msgstr "{0} {1}% 的 GPS 軌跡"
-
-#~ msgid "play/pause"
-#~ msgstr "播放/暫停"
-
-#~ msgid "backward"
-#~ msgstr "倒轉"
-
-#~ msgid "forward"
-#~ msgstr "快轉"
-
-#~ msgid "faster"
-#~ msgstr "加速"
-
-#~ msgid "slower"
-#~ msgstr "減速"
-
-#~ msgid ""
-#~ "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing "
-#~ "'&' or a trailing '?'."
-#~ msgstr "警告：WMS 服務的基礎 URL「{0}」缺少「&」或「?」。"
-
-#~ msgid ""
-#~ "Object of type {0} with id {1} was marked to be deleted, but it's missing "
-#~ "in the source dataset"
-#~ msgstr ""
-#~ "類型 {0} id 為 {1} 的物件已標記為刪除，但是在原始資料組合中 卻找不到"
-
-#~ msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
-#~ msgstr "類型 {0} id 為 {1} 的物件在「visible」屬性中有衝突"
-
-#~ msgid ""
-#~ "It looks like JOSM crashed last time. Do you like to restore the data?"
-#~ msgstr "看來 JOSM 上次似乎是當機了。您想要還原資料嗎？"
-
-#~ msgid "Allows to change the labelling of track waypoints."
-#~ msgstr "允許改變軌跡航點的標籤。"
-
-#~ msgid "Internal style"
-#~ msgstr "內部樣式"
-
-#~ msgid "Allow remote control (reqires remotecontrol plugin)"
-#~ msgstr "允許遠端控制（需要 remotecontrol 外掛程式）"
-
-#~ msgid "Launch browser with wiki help to selected object"
-#~ msgstr "執行瀏覽器取得選取物件的 wiki 說明"
-
-#~ msgid "Change properties of 1 object"
-#~ msgstr "改變 1 個物件的屬性"
-
-#~ msgid "You have {0} Elements selected. But you can edit only one element!"
-#~ msgstr "您已選取 {0} 個元素。但是您只能編輯一個元素！"
-
-#~ msgid "Zoom level was not enough to record an offset precisely"
-#~ msgstr "縮放等級不足以精確的記錄位移"
-
-#~ msgid "import data from URL"
-#~ msgstr "從 URL 匯入資料"
-
-#~ msgid "read protocol version"
-#~ msgstr "讀取通訊協定版本"
-
-#~ msgid "Seamap Editor"
-#~ msgstr "海圖編輯器"
-
-#~ msgid "Seanap Editor"
-#~ msgstr "海圖編輯器"
-
-#~ msgid "please enter GPS timecode"
-#~ msgstr "請輸入 GPS 時刻碼"
-
-#~ msgid "Unnamed WMS Layer"
-#~ msgstr "未命名 WMS 圖層"
-
-#~ msgid ""
-#~ "That layer does not support any of JOSM's projections,\n"
-#~ "so you can not use it. This message will not show again."
-#~ msgstr ""
-#~ "那個圖層不支援任何 JOSM 的投影法，\n"
-#~ "因此您不能使用它。這個訊息不會再度顯示。"
-
-#~ msgid "Could not initialize remote control."
-#~ msgstr "無法初始化遠端控制。"
-
-#~ msgid "Remote control plugin is not compatible with {0}."
-#~ msgstr "遠端控制外掛程式不相容 {0}。"
-
-#~ msgid ""
-#~ "{0} will work but remote control for this plugin is disabled.\n"
-#~ "You should update the plugins."
-#~ msgstr ""
-#~ "{0} 會運作但這個外掛程式的遠端控制已停用。\n"
-#~ "您應該更新這個外掛程式。"
-
-#~ msgid ""
-#~ "Current version of \"{1}\": {2}, internal version {3}. Need version {4}, "
-#~ "internal version {5}.\n"
-#~ "If updating the plugins does not help report a bug for \"{0}\"."
-#~ msgstr ""
-#~ "目前「{1}」的版本：{2}，內部的版本 {3}。需要版本 {4}，內部版本 {5}。\n"
-#~ "如果更新外掛程式沒有改善請回報程式錯誤到「{0}」。"
-
-#~ msgid "{0}: Problem with remote control"
-#~ msgstr "{0}：遠端控制有問題"
-
-#~ msgid "Add WMS URL"
-#~ msgstr "加入 WMS URL"
-
-#~ msgid ""
-#~ "Remote Control has been asked to load a WMS layer from the following URL:"
-#~ msgstr "遠端控制被要求從下列 URL 載入 WMS 圖層："
-
-#~ msgid "Remote WMS"
-#~ msgstr "遠端 WMS"
-
-#~ msgid "used"
-#~ msgstr "已使用"
-
-#~ msgid "Available styles (from {0}):"
-#~ msgstr "可用的樣式（來自 {0}）："
-
-#~ msgid "replaced by {0} plugin"
-#~ msgstr "由 {0} 外掛程式取代"
-
-#~ msgid "Elevation profile for track '"
-#~ msgstr "海拔設定檔，於軌跡"
-
-#~ msgid ""
-#~ "Please select at least two nodes to merge or node that is close to "
-#~ "another node."
-#~ msgstr "請至少選擇要合併的兩個節點或臨近另一個節點的節點。"
-
-#~ msgid "Projection ''{0}'' not found"
-#~ msgstr "找不到投影方法「{0}」"
-
-#~ msgid "WMSPlugin/SlippyMap settings migration"
-#~ msgstr "WMSPlugin/SlippyMap 設定值轉換"
-
-#~ msgid "Imagery settings migration: conflict when moving property {0} -> {1}"
-#~ msgstr "圖片設定值轉移：當移動屬性 {0} -> {1} 時發生衝突"
-
-#~ msgid "Imagery settings migration: conflict when moving array {0} -> {1}"
-#~ msgstr "圖片設定值轉移：當移動陣列 {0} -> {1} 時發生衝突"
-
-#~ msgid "There are {0} unknown WMSPlugin settings"
-#~ msgstr "還有 {0} 不明的 WMSPlugin 設定值"
-
-#~ msgid "There are {0} unknown slippymap plugin settings"
-#~ msgstr "還有 {0} 不明的 slippymap 外掛程式設定值"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please adjust WMS layer manually by using known exact objects/traces/... "
-#~ "before starting to map"
-#~ msgstr ""
-#~ "\n"
-#~ "在開始繪圖之前請先使用已知道物件/軌跡/... 調整 WMS 圖層"
-
-#~ msgid "EPSG31287"
-#~ msgstr "EPSG31287"
-
-#~ msgid "Simplify Area (remove {0} node)"
-#~ msgid_plural "Simplify Area (remove {0} nodes)"
-#~ msgstr[0] "簡化區域（移除 {0} 個節點）"
-
-#~ msgid "White"
-#~ msgstr "純"
-
-#~ msgid "Red"
-#~ msgstr "紅"
-
-#~ msgid "Orange"
-#~ msgstr "橘"
-
-#~ msgid "Yellow"
-#~ msgstr "黃"
-
-#~ msgid "Green"
-#~ msgstr "綠"
-
-#~ msgid "Blue"
-#~ msgstr "藍"
-
-#~ msgid "Black"
-#~ msgstr "黑"
-
-#~ msgid "Privacy"
-#~ msgstr "隱私"
-
-#~ msgid "Keep current settings"
-#~ msgstr "保留目前的設定值"
-
-#~ msgid "Overwrite with WMSPlugin list"
-#~ msgstr "覆蓋 WMSPlugin 清單"
-
-#~ msgid "Keep current list"
-#~ msgstr "保留目前的清單"
-
-#~ msgid "Overwrite with WMSPlugin settings"
-#~ msgstr "覆蓋 WMSPlugin 設定值"
-
-#~ msgid "WMSPlugin settings:"
-#~ msgstr "WMSPlugin 設定值："
-
-#~ msgid "WMS layer list:"
-#~ msgstr "WMS 圖層清單："
-
-#~ msgid "SlippyMap settings:"
-#~ msgstr "SlippyMap 設定值："
-
-#~ msgid "Imagery settings migration"
-#~ msgstr "圖片設定值轉移"
-
-#~ msgid "Warning: unexpected settings conflict"
-#~ msgstr "警告：未預期的設定值衝突"
-
-#~ msgid "Overwrite with SlippyMap settings"
-#~ msgstr "覆蓋 SlippyMap 設定值"
-
-#~ msgid "set {0}"
-#~ msgstr "設定 {0}"
-
-#~ msgid "Current projection is set to {0}"
-#~ msgstr "目前的投影方法設為 {0}"
-
-#~ msgid "Add offset bookmark"
-#~ msgstr "加入位移書籤"
-
-#~ msgid "(save current)"
-#~ msgstr "(儲存目前的)"
-
-#~ msgid "Invalidate bug"
-#~ msgstr "證明錯誤"
-
-#~ msgid "Re-open bug"
-#~ msgstr "重開錯誤"
-
-#~ msgid "Close bug"
-#~ msgstr "關閉錯誤"
-
-#~ msgid "Add comment"
-#~ msgstr "加入註解"
-
-#~ msgid "No colour"
-#~ msgstr "沒有顏色"
-
-#~ msgid "Violet"
-#~ msgstr "紫羅蘭"
-
-#~ msgid "Amber"
-#~ msgstr "琥珀色"
-
-#~ msgid "OSM-Cert"
-#~ msgstr "OSM-憑證"
-
-#~ msgid "Key Signatures"
-#~ msgstr "設定鍵簽章"
-
-#~ msgid "GnuPG command to execute:"
-#~ msgstr "要執行的 GnuPG 指令："
-
-#~ msgid "Don't ask again for the key"
-#~ msgstr "不要再詢問這個金鑰"
-
-#~ msgid "Built-in Style, internal path:</b>"
-#~ msgstr "內建樣式，內部路徑：</b>"
-
-#~ msgid "Pixel scale: {0}"
-#~ msgstr "像素縮放：{0}"
-
-#~ msgid "Display zoom: {0}"
-#~ msgstr "顯示的縮放：{0}"
-
-#~ msgid "Current zoom: {0}"
-#~ msgstr "目前的縮放：{0}"
-
-#~ msgid "Best zoom: {0}"
-#~ msgstr "最佳縮放：{0}"
-
-#~ msgid "remove entry"
-#~ msgstr "移除項目"
-
-#~ msgid "add a new wms/tms entry by entering the url"
-#~ msgstr "輸入網址以加入新的 wms/tms 項目"
-
-#~ msgid "Internal Style"
-#~ msgstr "內部樣式"
-
-#~ msgid "Drag the way segment and drop it on a target segment"
-#~ msgstr "拖曳路徑區段並將它放到目標區段上"
-
-#~ msgid "Drag/drop: drag the way segment an drop it on a target segment"
-#~ msgstr "拖/放：拖曳路徑區段並將它放到目標區段上"
-
-#~ msgid "Can''t select an isolated node"
-#~ msgstr "不能選取獨立的節點"
-
-#~ msgid "Left-Click: deselect node"
-#~ msgstr "左擊：取消選取節點"
-
-#~ msgid "Left-Click: select node"
-#~ msgstr "右擊：選擇節點"
-
-#~ msgid "Contour Merge"
-#~ msgstr "輪廓合併"
-
-#~ msgid "Merge the contour of an area with the contour of another area"
-#~ msgstr "將區域的輪廓與另一個區域的輪廓合併"
-
-#~ msgid "Merging Contour"
-#~ msgstr "合併輪廓"
-
-#~ msgid "Drop to align to the the target segment"
-#~ msgstr "拖放以對齊目標區段"
-
-#~ msgid "Run..."
-#~ msgstr "執行..."
-
-#~ msgid "Run a script"
-#~ msgstr "執行一份命令稿"
-
-#~ msgid "Select a script file and click on <strong>Run</strong>."
-#~ msgstr "選擇一個命令稿檔案並點選<strong>執行</strong>。"
-
-#~ msgid "The script file ''{0}'' isn''t readable."
-#~ msgstr "命令稿檔案「{0}」不可讀取"
-
-#~ msgid "Please enter a file name first."
-#~ msgstr "請先輸入檔案名稱。"
-
-#~ msgid "The script file ''{0}'' doesn''t exist."
-#~ msgstr "命令稿檔案「{0}」不存在。"
-
-#~ msgid "Run the script"
-#~ msgstr "執行命令稿"
-
-#~ msgid "Run"
-#~ msgstr "執行"
-
-#~ msgid "Failed to read the script from the file ''{0}''."
-#~ msgstr "從檔案「{0}」讀取命令稿失敗。"
-
-#~ msgid "File not readable"
-#~ msgstr "檔案不可讀取"
-
-#~ msgid "Empty file name"
-#~ msgstr "空白檔案名稱"
-
-#~ msgid "File:"
-#~ msgstr "檔案："
-
-#~ msgid "Enter the name of a script file"
-#~ msgstr "輸入命令稿檔案的名字"
-
-#~ msgid ""
-#~ "<p>The script can''t be executed, because there are currently no "
-#~ "scripting engines installed.</p><p>Refer to the online help for "
-#~ "information about how to install a scripting engine with JOSM.</p>"
-#~ msgstr ""
-#~ "<p>命令稿不能執行，因為目前沒有安裝命令稿引擎。</p><p>請參考線上求助以了解"
-#~ "如何在 JOSM 安裝命令稿引擎的資訊。</p>"
-
-#~ msgid "No script engine"
-#~ msgstr "沒有命令稿引擎"
-
-#~ msgid "Failed to read a macro from the file ''{0}''."
-#~ msgstr "無法從檔案「{0}」讀取巨集。"
-
-#~ msgid "IO error"
-#~ msgstr "IO 錯誤"
-
-#~ msgid "Launch file selection dialog"
-#~ msgstr "執行檔案選擇對話盒"
-
-#~ msgid "Select a script"
-#~ msgstr "選擇一個命令稿"
-
-#~ msgid "Script Error"
-#~ msgstr "命令稿錯誤"
-
-#~ msgid "Script execution has failed."
-#~ msgstr "命令稿執行失敗。"
-
-#~ msgid "Macro execution has failed."
-#~ msgstr "巨集執行失敗。"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Configure..."
-#~ msgstr "設定..."
-
-#~ msgid "cancel"
-#~ msgstr "取消"
-
-#~ msgid ""
-#~ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' "
-#~ "is missing."
-#~ msgstr "jar 檔案「{0}」不能提供命令稿引擎。缺少項目「{1}」。"
-
-#~ msgid "Scripting"
-#~ msgstr "命令稿"
-
-#~ msgid "Configure scripting preferences"
-#~ msgstr "設定命令稿偏好設定"
-
-#~ msgid "Script engines"
-#~ msgstr "命令稿引擎"
-
-#~ msgid "''{0}'' doesn''t exist."
-#~ msgstr "「{0}」不存在。"
-
-#~ msgid "Accept the selected scripting engine"
-#~ msgstr "套用選取的命令稿引擎"
-
-#~ msgid "Configure script engines and scripts"
-#~ msgstr "設定命令稿引擎和命令稿"
-
-#~ msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-#~ msgstr "「{0}」不可讀取。不能從這個檔案載入命令稿引擎。"
-
-#~ msgid "''{0}'' is a directory. Expecting a jar file instead."
-#~ msgstr "「{0}」是一個目錄。預期應該是一個 jar 檔案。"
-
-#~ msgid ""
-#~ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-#~ "this file"
-#~ msgstr "無法將檔案「{0}」開啟為 jar 檔案。不能從這個檔案載入命令稿引擎"
-
-#~ msgid "Add a jar file providing a script engine"
-#~ msgstr "加入提供命令稿引擎的 jar 檔案"
-
-#~ msgid "Launch file chooser"
-#~ msgstr "執行檔案選取器"
-
-#~ msgid "JAR file"
-#~ msgstr "JAR 檔案"
-
-#~ msgid "Remove the selected jar files"
-#~ msgstr "移除選取的 jar 檔案"
-
-#~ msgid "Select a jar file"
-#~ msgstr "選擇一個 jar 檔案"
-
-#~ msgid "JOSM currently supports the following script engines:"
-#~ msgstr "JOSM 目前支援下列命令稿引擎："
-
-#~ msgid "Available script engines"
-#~ msgstr "可用的命令稿引擎"
-
-#~ msgid "Enter additional JAR files which provide script engines."
-#~ msgstr "輸入提供命令稿引擎的額外 JAR 檔案。"
-
-#~ msgid "JAR files"
-#~ msgstr "JAR 檔案"
-
-#~ msgid "{1} (with engine {0})"
-#~ msgstr "{1} (使用引擎 {0})"
-
-#~ msgid "MIME-Types:"
-#~ msgstr "MIME-類型："
-
-#~ msgid "Language:"
-#~ msgstr "語言："
-
-#~ msgid "Language version:"
-#~ msgstr "語言版本："
-
-#~ msgid "Version:"
-#~ msgstr "版本："
-
-#~ msgid "Allows to run scripts in JOSM."
-#~ msgstr "允許在 JOSM 中執行命令稿。"
-
-#~ msgid "Merges the contours of two areas"
-#~ msgstr "合併兩個區域的輪廓"
-
-#~ msgid "Warning: failed to load mime types from file ''0''."
-#~ msgstr "警告：無法載入檔案「0」的 mime 類型。"
-
-#~ msgid "Warning: failed to load default mime types from  resource ''0''."
-#~ msgstr "警告：無法載入來源「0」的預設 mime 類型。"
-
-#~ msgid "Please select a scripting engine to execute the selected script."
-#~ msgstr "請選擇用來執行選取的命令稿的命令稿引擎。"
-
-#~ msgid ""
-#~ "Enter the coordinates for the new node.<br/>You can separate longitude "
-#~ "and latitude with space, comma or semicolon.<br/>Use positive numbers or "
-#~ "N, E characters to indicate North or East cardinal direction.<br/>For "
-#~ "South and West cardinal directions you can use either negative numbers or "
-#~ "S, W characters.<br/>Coordinate value can be in one of three formats:"
-#~ "<ul><li><i>degrees</i><tt>&deg;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt></li><li><i>degrees</i><tt>&deg;</tt> "
-#~ "<i>minutes</i><tt>&#39;</tt> <i>seconds</i><tt>&quot</tt></li></"
-#~ "ul>Symbols <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</"
-#~ "tt>, <tt>&Prime;</tt> are optional.<br/><br/>Some examples:"
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
-#~ msgstr ""
-#~ "輸入新節點的坐標。<br/>您可以用空白、逗號或分號來分隔經度和緯度。<br/>使用"
-#~ "正數或 N, E 字元來代表北方或東方主方向。<br/>而南方和西方主方向則可以使用"
-#~ "負數或 S, W 字元。<br/>坐標數值可以是下列三種格式之一：<ul><li><i>度</"
-#~ "i><tt>&deg;</tt></li><li><i>度</i><tt>&deg;</tt> <i>分</i><tt>&#39;</tt></"
-#~ "li><li><i>度</i><tt>&deg;</tt> <i>分</i><tt>&#39;</tt> <i>秒</"
-#~ "i><tt>&quot</tt></li></ul>符號 <tt>&deg;</tt>, <tt>&#39;</tt>, <tt>&prime;"
-#~ "</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> 是選擇性的。<br/><br/>一些範例："
-#~ "<ul><li>49.29918&deg; 19.24788&deg;</li><li>N 49.29918 E 19.24788</"
-#~ "li><li>W 49&deg;29.918&#39; S 19&deg;24.788&#39;</li><li>N "
-#~ "49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;</li><li>49.29918 N, "
-#~ "19.24788 E</li><li>49&deg;29&#39;21&quot; N 19&deg;24&#39;38&quot; E</"
-#~ "li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</"
-#~ "li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, W 19&deg; 24</"
-#~ "li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 15.88</"
-#~ "li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg "
-#~ "42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
+#~ "將偏好設定中的  \"{0}\"  設定為 yes/no/ask\n"
+#~ "以控制校準檔案的自動載入"
+
+#~ msgid "Allows to filter out unnececary GPS tracks"
+#~ msgstr "允許過濾掉不需要的 GPS 軌跡"
+
+#~ msgid "Download referrers for the the chosen relation and its members"
+#~ msgstr "下載選取關係及它的成員的參照"
Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java	(revision 26529)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java	(revision 26530)
@@ -30,5 +30,5 @@
         JLabel label2=new JLabel(tr("Starting Epsilon"));
         JLabel label3=new JLabel(tr("Max points count per 1 km"));
-        JLabel label4=new JLabel(tr("Enter key mode"));
+        JLabel label4=new JLabel(/* I18n: Combobox to select what a press to return key does */ tr("Enter key mode"));
         JFormattedTextField text1=new JFormattedTextField(NumberFormat.getInstance());
         JFormattedTextField text2=new  JFormattedTextField(NumberFormat.getInstance());
